Un-extending core notification view in favor of Notifications plugin.

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

diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 838a123fb5703184f1531150bf0eec57e385d731..873095b8b8eb0300d29883eef1c429db7056b508 100644 (file)
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -22,9 +22,7 @@ function notifications_plugin_init() {
 
        // Unset the default notification settings
        unregister_plugin_hook('usersettings:save', 'user', 'notification_user_settings_save');
-       
-       // must wait until elgg_unextend_view() is merged in from 1.7 branch - if still needed
-       //elgg_unextend_view('usersettings/user', 'notifications/settings/usersettings');
+       elgg_unextend_view('usersettings/user', 'notifications/settings/usersettings');
 }
 
 /**

diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
index ea11ade8faf64b41feb2f29a3b208dc9c5a52d8c..c659ae0baf2ae7a1853c6d5422b926df1ab672e4 100644 (file)
--- a/views/default/notifications/settings/usersettings.php
+++ b/views/default/notifications/settings/usersettings.php
@@ -33,7 +33,15 @@ $notification_settings = get_user_notification_settings(page_owner());
        } else {
                $val = "no";
        }
-       echo elgg_view('input/radio',array('internalname' => "method[{$k}]", 'options' => array(elgg_echo('option:yes') => 'yes',elgg_echo('option:no') => 'no'), 'value' => $val));
+       
+       echo elgg_view('input/radio', array(
+               'internalname' => "method[$k]",
+               'value' => $val,
+               'options' => array(
+                       elgg_echo('option:yes') => 'yes',
+                       elgg_echo('option:no') => 'no'
+               ),
+       ));
 
 ?>
                        </td>