From d3efed2f847ced2ecfaa536856f6a0acc4cddbfc Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 4 Aug 2008 17:08:31 +0000
Subject: User settings

git-svn-id: https://code.elgg.org/elgg/trunk@1689 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/users.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'engine/lib/users.php')

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 70879f9c0..ec247337a 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1113,19 +1113,15 @@
 	}
 	
 	/**
-	 * Users initialisation function, which establishes the page handler
+	 * Sets up user-related menu items
 	 *
 	 */
-	function users_init() {
+	function users_pagesetup() {
 		
 		// Load config
 			global $CONFIG;
-		
-		// Set up menu for logged in users
-			if (isloggedin())
-				add_menu(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/" . $_SESSION['user']->username);
-    		
-    	//add submenu options
+			
+		//add submenu options
 			if (get_context() == "friends" || 
 				get_context() == "friendsof" || 
 				get_context() == "collections") {
@@ -1133,6 +1129,21 @@
 				add_submenu_item(elgg_echo('friends:of'),$CONFIG->wwwroot."pg/friendsof/" . page_owner_entity()->username);
 			}
 		
+	}
+	
+	/**
+	 * Users initialisation function, which establishes the page handler
+	 *
+	 */
+	function users_init() {
+		
+		// Load config
+			global $CONFIG;
+		
+		// Set up menu for logged in users
+			if (isloggedin())
+				add_menu(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/" . $_SESSION['user']->username);
+		
 		register_page_handler('friends','friends_page_handler');
 		register_page_handler('friendsof','friends_of_page_handler');
 		register_page_handler('collections','collections_page_handler');
@@ -1210,5 +1221,6 @@
 	//register actions *************************************************************
    
    		register_elgg_event_handler('init','system','users_init',0);
+   		register_elgg_event_handler('pagesetup','system','users_pagesetup',0);
 	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3