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, 6 insertions, 10 deletions

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