diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-15 02:49:24 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-15 02:49:24 +0000 |
| commit | b3c486b0ba9a3005e9b4ebf8269df582e84fc72f (patch) | |
| tree | 387c8e294a8684517e9a6f5d29992e4784e79154 | |
| parent | b9ffc51a110107be82cb1151acd9c7cd07f55ab1 (diff) | |
| download | elgg-b3c486b0ba9a3005e9b4ebf8269df582e84fc72f.tar.gz elgg-b3c486b0ba9a3005e9b4ebf8269df582e84fc72f.tar.bz2 | |
moved default notification settings into usersettings
git-svn-id: http://code.elgg.org/elgg/trunk@7629 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/notification.php | 2 | ||||
| -rw-r--r-- | mod/notifications/start.php | 2 | ||||
| -rw-r--r-- | views/default/usersettings/notifications.php (renamed from views/default/notifications/settings/usersettings.php) | 0 |
3 files changed, 2 insertions, 2 deletions
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 index afb142ebe..afb142ebe 100644 --- a/views/default/notifications/settings/usersettings.php +++ b/views/default/usersettings/notifications.php |