1 files changed, 40 insertions, 46 deletions
diff --git a/mod/blog/friends.php b/mod/blog/friends.php
index 2cef9c9e8..24aa36c8b 100644
--- a/mod/blog/friends.php
+++ b/mod/blog/friends.php
@@ -1,47 +1,41 @@
-<?php
-
-	/**
-	 * Elgg blog friends page
-	 * 
-	 * @package ElggBlog
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-	// Load Elgg engine
-		define('everyoneblog','true');
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-		
-	// Get the current page's owner
-		$page_owner = page_owner_entity();
-		if ($page_owner === false || is_null($page_owner)) {
-			$page_owner = $_SESSION['user'];
-			set_page_owner($_SESSION['guid']);
-		}
-		if (!($page_owner instanceof ElggEntity)) forward();
-
-	//set the title
-        if($page_owner == $_SESSION['user']){
-			$title = elgg_echo('blog:yourfriends');
-		}else{
-			$title = $page_owner->name . "'s " . elgg_echo('blog:friends');
-		}
-		
-		$area2 = elgg_view_title($title);
-		
-		// Get a list of blog posts
-		$area2 .= "<div id='blogs'>" . list_user_friends_objects($page_owner->getGUID(),'blog',10,false) . "<div class='clearfloat'></div></div>";
-		
-	// Get categories, if they're installed
-		global $CONFIG;
-		$area3 = elgg_view('blog/categorylist',array('baseurl' => $CONFIG->wwwroot . 'search/?subtype=blog&owner_guid='.$page_owner->guid.'&friends='.$page_owner->guid.'&tagtype=universal_categories&tag=','subtype' => 'blog'));
-		
-	// Display them in the page
-        $body = elgg_view_layout("two_column_left_sidebar", '', $area1 . $area2, $area3);
-		
-	// Display page
-		page_draw($title, $body);
-		
+<?php
+
+	/**
+	 * Elgg blog friends page
+	 */
+
+	// Load Elgg engine
+		define('everyoneblog','true');
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+		if (!($page_owner instanceof ElggEntity)) forward();
+
+	//set blog title
+		$area1 = elgg_view('blog/blog_header', array('context' => "friends", 'type' => 'blog'));
+		
+	// Get a list of blog posts
+		set_context('search');
+		$area2 .= "<div id='blogs'>" . list_user_friends_objects($page_owner->getGUID(),'blog',10,false) . "<div class='clearfloat'></div></div>";
+		set_context('blog');
+		
+	// Get categories, if they're installed
+		global $CONFIG;
+		//$area3 .= elgg_view("blogs/favourite", array("object_type" => 'blog'));
+		$comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc");
+		$area3 .= elgg_view('page_elements/latest_comments', array('comments' => $comments));
+	//include a view for plugins to extend
+		$area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));
+		
+	// Display them in the page
+        $body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3);
+		
+	// Display page
+		page_draw(elgg_echo('blog:friends'),$body);
+		
 ?>
 \ No newline at end of file