aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_notifications.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2012-09-27 10:37:37 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2012-09-27 10:37:37 -0500
commitae91a0a846828b44a53c2a7cd724e0ba062b0f3e (patch)
tree1bcd36a425c6cc11cc924b9b53831f6edefc09e9 /phpBB/includes/ucp/ucp_notifications.php
parent544fbe35f4b5cd12e4556c9c300f471a4092dc41 (diff)
downloadforums-ae91a0a846828b44a53c2a7cd724e0ba062b0f3e.tar
forums-ae91a0a846828b44a53c2a7cd724e0ba062b0f3e.tar.gz
forums-ae91a0a846828b44a53c2a7cd724e0ba062b0f3e.tar.bz2
forums-ae91a0a846828b44a53c2a7cd724e0ba062b0f3e.tar.xz
forums-ae91a0a846828b44a53c2a7cd724e0ba062b0f3e.zip
[ticket/11103] Allow grouping of multiple types in ucp notification options
Ability to hide notification types from UCP Notification options (if users do not have permission to use the notification type, or for whatever reason they should not see it) PHPBB3-11103
Diffstat (limited to 'phpBB/includes/ucp/ucp_notifications.php')
-rw-r--r--phpBB/includes/ucp/ucp_notifications.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 0a01cd1cde..86052ada14 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -76,12 +76,12 @@ class ucp_notifications
*/
public function output_notification_types($block = 'notification_types', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
{
- foreach($phpbb_notifications->get_subscription_types() as $type)
+ foreach($phpbb_notifications->get_subscription_types() as $type => $data)
{
$template->assign_block_vars($block, array(
'TYPE' => $type,
- 'NAME' => $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
+ 'NAME' => (isset($data['lang'])) ? $user->lang($data['lang']) : $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
));
$this->output_notification_methods($block . '.notification_methods', $phpbb_notifications, $template, $user);