Merged friends pages fixes in r6501:6503 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@6515 36083f99-b078-4883-b0ff-0f9b5a30f544

5 files changed, 44 insertions, 43 deletions

diff --git a/friends/add.php b/friends/add.php
index a7bbb6218..0adbd7a63 100644
--- a/friends/add.php
+++ b/friends/add.php
@@ -8,19 +8,18 @@
  * @link http://elgg.org/
  */
 
-// Start engine
-require_once(dirname(dirname((__FILE__))) . "/engine/start.php");
-
 // You need to be logged in for this one
 gatekeeper();
 
-$area2 = elgg_view('friends/forms/edit', array(
-	'friends' => get_user_friends($_SESSION['user']->getGUID(), "", 9999)
+$title = elgg_echo('friends:collections:add');
+
+$content = elgg_view_title($title);
+
+$content .= elgg_view('friends/forms/edit', array(
+	'friends' => get_user_friends(get_loggedin_userid(), "", 9999)
 	)
 );
 
-// Format page
-$body = elgg_view_layout('one_column_with_sidebar', elgg_view_title(elgg_echo('friends:collections:add')) . $area2);
+$body = elgg_view_layout('one_column_with_sidebar', $content);
 
-// Draw it
-page_draw(elgg_echo('friends:collections:add'),$body);
\ No newline at end of file
+page_draw(elgg_echo('friends:collections:add'),$body);
diff --git a/friends/collections.php b/friends/collections.php
index 5d3149de5..25ab98c4c 100644
--- a/friends/collections.php
+++ b/friends/collections.php
@@ -8,16 +8,15 @@
  * @link http://elgg.org/
  */
 
-// Start engine
-require_once(dirname(dirname((__FILE__))) . "/engine/start.php");
-
 // You need to be logged in for this one
 gatekeeper();
 
-$area2 = elgg_view_access_collections($_SESSION['user']->getGUID());
+$title = elgg_echo('friends:collections');
+
+$content = elgg_view_title($title);
+
+$content .= elgg_view_access_collections(get_loggedin_userid());
 
-// Format page
-$body = elgg_view_layout('one_column_with_sidebar', elgg_view_title(elgg_echo('friends:collections')) . $area2);
+$body = elgg_view_layout('one_column_with_sidebar', $content);
 
-// Draw it
-page_draw(elgg_echo('friends:collections'),$body);
\ No newline at end of file
+page_draw($title, $body);
diff --git a/friends/edit.php b/friends/edit.php
index 428b44bad..c164a819e 100644
--- a/friends/edit.php
+++ b/friends/edit.php
@@ -8,14 +8,12 @@
  * @link http://elgg.org/
  */
 
-// Start engine
-require_once(dirname(dirname((__FILE__))) . "/engine/start.php");
-
 // You need to be logged in for this one
 gatekeeper();
 
-//set the title
-$area1 = elgg_view_title(elgg_echo('friends:collectionedit'), false);
+$title = elgg_echo('friends:collectionedit');
+
+$content = elgg_view_title($title);
 
 //grab the collection id passed to the edit form
 $collection_id = get_input('collection');
@@ -26,10 +24,8 @@ $collection = get_access_collection($collection_id);
 //get all members of the collection
 $collection_members = get_members_of_access_collection($collection_id);
 
-$area2 = elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
+$content .= elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
 
-// Format page
-$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+$body = elgg_view_layout('one_column_with_sidebar', $content);
 
-// Draw it
-page_draw(elgg_echo('friends:add'),$body);
\ No newline at end of file
+page_draw($title, $body);
\ No newline at end of file
diff --git a/friends/index.php b/friends/index.php
index 23dd098d5..b7f0a2a75 100644
--- a/friends/index.php
+++ b/friends/index.php
@@ -8,15 +8,19 @@
  * @link http://elgg.org/
  */
 
-if (!$owner = page_owner_entity()) {
+$owner = page_owner_entity();
+if (!$owner) {
 	gatekeeper();
-	set_page_owner($_SESSION['user']->getGUID());
-	$owner = $_SESSION['user'];
+	set_page_owner(get_loggedin_userid());
+	$owner = page_owner_entity();
 }
-$friends = sprintf(elgg_echo("friends:owned"),$owner->name);
 
-$area1 = elgg_view_title($friends);
-$area2 = "<div class='members_list'>".list_entities_from_relationship('friend',$owner->getGUID(),false,'user','',0,10,false)."</div>";
-$body = elgg_view_layout('one_column_with_sidebar', $area1 . $area2);
+$title = sprintf(elgg_echo("friends:owned"), $owner->name);
 
-page_draw($friends, $body);
+$content = elgg_view_title($title);
+
+$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), FALSE, 'user', '', 0, 10, FALSE) . "</div>";
+
+$body = elgg_view_layout('one_column_with_sidebar', $content);
+
+page_draw($title, $body);
diff --git a/friends/of.php b/friends/of.php
index d3668d587..a64b9cb6e 100644
--- a/friends/of.php
+++ b/friends/of.php
@@ -8,16 +8,19 @@
  * @link http://elgg.org/
  */
 
-if (!$owner = page_owner_entity()) {
+$owner = page_owner_entity();
+if (!$owner) {
 	gatekeeper();
-	set_page_owner($_SESSION['user']->getGUID());
-	$owner = $_SESSION['user'];
+	set_page_owner(get_loggedin_userid());
+	$owner = page_owner_entity();
 }
-$friends_of = sprintf(elgg_echo("friends:of:owned"),$owner->name);
 
-$area1 = elgg_view_title($friends_of);
-$area2 = "<div class='members_list'>".list_entities_from_relationship('friend',$owner->getGUID(),true,'user','',0,10,false)."</div>";
-$body = elgg_view_layout('one_column_with_sidebar', $area1 . $area2);
+$title = sprintf(elgg_echo("friends:of:owned"), $owner->name);
 
-page_draw($friends_of, $body);
+$content = elgg_view_title($title);
 
+$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), TRUE, 'user', '', 0, 10, FALSE) . "</div>";
+
+$body = elgg_view_layout('one_column_with_sidebar', $content);
+
+page_draw($title, $body);