Closes #90: Settings: Change name

http://trac.elgg.org/elgg/ticket/90

git-svn-id: https://code.elgg.org/elgg/trunk@1142 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 9 insertions, 5 deletions

diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 8a2f2c432..aa2ecbfdd 100644
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -248,10 +248,6 @@
 		// Register a notification handler for the default email method
 		register_notification_handler("email", "email_notify_handler");
 		
-		// Add email settings
-		extend_elgg_settings_page('notifications/settings/email', 'usersettings/user');
-		register_action("email/save");
-		
 		// Add settings view to user settings & register action
 		extend_elgg_settings_page('notifications/settings/usersettings', 'usersettings/user');
 		register_action("notifications/settings/usersettings/save");
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 5b8f04389..c0c43cb2f 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -900,7 +900,15 @@
 		register_action("register",true);

    		register_action("friends/add");

    		register_action("friends/remove");

-		register_action("email/confirm");

+		register_action("email/confirm");
+
+		// User name change
+		extend_elgg_settings_page('user/settings/name', 'usersettings/user', 1);
+		register_action("user/name");
+		
+		// Add email settings
+		extend_elgg_settings_page('user/settings/email', 'usersettings/user', 1);
+		register_action("email/save");

 	}

 	

 	//register actions *************************************************************