From ca08eb6d170d375ef4fca53604956f3474c7db19 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 22:37:30 +0000
Subject: Merged r6701:6756 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6849 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 settings/user.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'settings/user.php')

diff --git a/settings/user.php b/settings/user.php
index 7e7a3967f..0d5b0e219 100644
--- a/settings/user.php
+++ b/settings/user.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg user settings functions.
+ * Elgg user account settings.
  *
  * @package Elgg
  * @subpackage Core
@@ -16,11 +16,12 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
-	set_page_owner($_SESSION['guid']);
+	set_page_owner(get_loggedin_userid());
 }
 
-// Display main admin menu
-page_draw(
-	elgg_echo("usersettings:user"),
-	elgg_view_layout("one_column_with_sidebar", elgg_view_title(elgg_echo('usersettings:user')) . elgg_view("usersettings/form"))
-);
\ No newline at end of file
+$content = elgg_view_title(elgg_echo('usersettings:user'));
+$content .= elgg_view("usersettings/form");
+
+$body = elgg_view_layout("one_column_with_sidebar", $content);
+
+page_draw(elgg_echo("usersettings:user"), $body);
-- 
cgit v1.2.3