From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 15 Dec 2010 02:49:24 +0000 (+0000)
Subject: moved default notification settings into usersettings
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b3c486b0ba9a3005e9b4ebf8269df582e84fc72f;p=lorea%2Felgg.git

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 e75e6b34b..5a96b9623 100644
--- 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 eb9e4778e..15b079bda 100644
--- 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