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

1 files changed, 8 insertions, 9 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);