mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Máté Bartus
2017-09-07 14:32:51 +02:00
parent 1bf9d4815d 6c13ca7a19
commit 6211b69a6f
9 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/ucp/ucp_notifications.php
View File

@@ -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,
));
}