moved default notification settings into usersettings

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

diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index e75e6b34b594ffcff4b2544d3d6cf512d4f8ecf0..5a96b96239f858ef72ea30b44156620848830345 100644 (file)
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -360,7 +360,7 @@ function notification_init() {
        register_notification_handler("email", "email_notify_handler");
 
        // Add settings view to user settings & register action
-       extend_elgg_settings_page('notifications/settings/usersettings', 'usersettings/user');
+       extend_elgg_settings_page('usersettings/notifications', 'usersettings/user');
 
        elgg_register_plugin_hook_handler('usersettings:save', 'user', 'notification_user_settings_save');
 }

diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index eb9e4778e5edde0ae98b142bf5f319ce8324b235..15b079bda7a53b08f41d9716b1124264d3a523a0 100644 (file)
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -18,7 +18,7 @@ function notifications_plugin_init() {
 
        // Unset the default notification settings
        elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user-settings_save');
-       elgg_unextend_view('usersettings/user', 'notifications/settings/usersettings');
+       elgg_unextend_view('usersettings/user', 'usersettings/notifications');
 
        // update notifications based on relationships changing
        elgg_register_event_handler('delete', 'member', 'notifications_relationship_remove');

diff --git a/views/default/notifications/settings/usersettings.php b/views/default/usersettings/notifications.php
similarity index 100%
rename from views/default/notifications/settings/usersettings.php
rename to views/default/usersettings/notifications.php