aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-26 21:53:13 +0000
committernickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-26 21:53:13 +0000
commitdcece443e979dc97b1a6e4c40fbba39d5531a47e (patch)
treeec052cdf5d20c9a48299a8cad7f287c4535ca6a3
parentb027f962af16d074398d1351a90d863aaf5469f3 (diff)
downloadelgg-dcece443e979dc97b1a6e4c40fbba39d5531a47e.tar.gz
elgg-dcece443e979dc97b1a6e4c40fbba39d5531a47e.tar.bz2
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
-rw-r--r--mod/notifications/start.php4
-rw-r--r--views/default/notifications/settings/usersettings.php10
2 files changed, 10 insertions, 4 deletions
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 838a123fb..873095b8b 100644
--- 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 ea11ade8f..c659ae0ba 100644
--- 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>