diff options
author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-11-14 19:03:58 +0000 |
---|---|---|
committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-11-14 19:03:58 +0000 |
commit | 9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2 (patch) | |
tree | 8cf4279f57f654d5435dacba4dc2bcb4030d2199 /engine/lib/users.php | |
parent | 2d55e88e095aa1a6b4f58101077aab81788761c9 (diff) | |
download | elgg-9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2.tar.gz elgg-9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2.tar.bz2 |
* 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
Diffstat (limited to 'engine/lib/users.php')
-rw-r--r-- | engine/lib/users.php | 11 |
1 files changed, 7 insertions, 4 deletions
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');
|