From 9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 14 Nov 2008 19:03:58 +0000 Subject: * Introducing get_loggedin_user() and get_loggedin_userid() * ACLs now using get_loggedin_user* * Some logic cleaned up * Some "Undefined..." messages cleaned up git-svn-id: https://code.elgg.org/elgg/trunk@2459 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/users.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'engine/lib/users.php') diff --git a/engine/lib/users.php b/engine/lib/users.php index 37a6b5bbd..d32dc5c0a 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1159,8 +1159,9 @@ * */ function collections_submenu_items() { - global $CONFIG; - add_submenu_item(elgg_echo('friends:collections'), $CONFIG->wwwroot . "pg/collections/" . $_SESSION['user']->username); + global $CONFIG; + $user = get_loggedin_user(); + add_submenu_item(elgg_echo('friends:collections'), $CONFIG->wwwroot . "pg/collections/" . $user->username); add_submenu_item(elgg_echo('friends:collections:add'),$CONFIG->wwwroot."pg/collections/add"); } @@ -1300,8 +1301,10 @@ global $CONFIG; // Set up menu for logged in users - if (isloggedin()) - add_menu(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/" . $_SESSION['user']->username); + if (isloggedin()) { + $user = get_loggedin_user(); + add_menu(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/" . $user->username); + } register_page_handler('friends','friends_page_handler'); register_page_handler('friendsof','friends_of_page_handler'); -- cgit v1.2.3