moved user settings extensions to user_settings library

diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index c716703570443add48a20fbce5abdab334b3bc5b..af30d8f0dff18b06ae9b483b962ef9e9f259add7 100644 (file)
--- a/engine/lib/user_settings.php
+++ b/engine/lib/user_settings.php
@@ -346,6 +346,13 @@ function usersettings_init() {
        elgg_register_plugin_hook_handler('usersettings:save', 'user', 'users_settings_save');
 
        elgg_register_action("usersettings/save");
+
+       // extend the account settings form
+       elgg_extend_view('forms/account/settings', 'core/settings/account/name', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/password', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/email', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/language', 100);
+       elgg_extend_view('forms/account/settings', 'core/settings/account/default_access', 100);
 }
 
 elgg_register_event_handler('init', 'system', 'usersettings_init');

diff --git a/engine/lib/users.php b/engine/lib/users.php
index beabcbb590cfa1e84cef51ee0c4d5a25841e472b..1b3cca7997299429dcca1e39d54841bb48570c61 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1562,13 +1562,6 @@ function users_init() {
 
        elgg_register_widget_type('friends', elgg_echo('friends'), elgg_echo('friends:widget:description'));
 
-       // extend the account settings form
-       elgg_extend_view('forms/account/settings', 'core/settings/account/name', 100);
-       elgg_extend_view('forms/account/settings', 'core/settings/account/password', 100);
-       elgg_extend_view('forms/account/settings', 'core/settings/account/email', 100);
-       elgg_extend_view('forms/account/settings', 'core/settings/account/language', 100);
-       elgg_extend_view('forms/account/settings', 'core/settings/account/default_access', 100);
-
        // Register the user type
        elgg_register_entity_type('user', '');