aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMáté Bartus <CHItA@users.noreply.github.com>2017-09-07 14:31:04 +0200
committerGitHub <noreply@github.com>2017-09-07 14:31:04 +0200
commit6e7593a5db7f8a8cb151882cb649362c85ad8732 (patch)
treeb98581f60d82b1bb3983c5b6abc5002de2835c66 /phpBB/includes
parentc1b00896b4d5d0b62798de7630686365b7aa8c05 (diff)
parentedd1ce74436c399f407e667b0b81b329a57a6f15 (diff)
downloadforums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar.gz
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar.bz2
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar.xz
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.zip
Merge pull request #4918 from kasimi/ticket/15328
[ticket/15328] Disable checkbox if notification method isn't supported
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_notifications.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 51bd77bd4c..835db44b90 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -180,13 +180,13 @@ class ucp_notifications
'GROUP_NAME' => $user->lang($group),
));
- foreach ($subscription_types as $type => $data)
+ foreach ($subscription_types as $type => $type_data)
{
$template->assign_block_vars($block, array(
'TYPE' => $type,
- 'NAME' => $user->lang($data['lang']),
- 'EXPLAIN' => (isset($user->lang[$data['lang'] . '_EXPLAIN'])) ? $user->lang($data['lang'] . '_EXPLAIN') : '',
+ 'NAME' => $user->lang($type_data['lang']),
+ 'EXPLAIN' => (isset($user->lang[$type_data['lang'] . '_EXPLAIN'])) ? $user->lang($type_data['lang'] . '_EXPLAIN') : '',
));
foreach ($notification_methods as $method => $method_data)
@@ -196,6 +196,8 @@ class ucp_notifications
'NAME' => $user->lang($method_data['lang']),
+ 'AVAILABLE' => $method_data['method']->is_available($type_data['type']),
+
'SUBSCRIBED' => (isset($subscriptions[$type]) && in_array($method_data['id'], $subscriptions[$type])) ? true : false,
));
}