mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity

[ticket/14076] Fix notification settings

Browse Source 
PHPBB3-14076
This commit is contained in:
Tristan Darricau 2015-08-07 16:38:12 +02:00
parent e4e3f595ec
commit 7e62b3a4b0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/phpbb/notification/manager.php
View File

@ -589,6 +589,7 @@ class manager
$user_id = $user_id ?: $this->user->data['user_id'];
$subscriptions = array();
$default_methods = $this->get_default_methods();
$user_notifications = $this->get_user_notifications($user_id);
@ -596,11 +597,8 @@ class manager
{
foreach ($types as $id => $type)
{
if (empty($user_notifications[$id]))
{
$subscriptions[$id] = $this->get_default_methods();
}
else
$subscriptions[$id] = array();
if (!empty($user_notifications[$id]))
{
foreach ($user_notifications[$id] as $user_notification)
{
@ -617,6 +615,8 @@ class manager
$subscriptions[$id][] = $user_notification['method'];
}
}
$subscriptions[$id] = array_merge($subscriptions[$id], $default_methods);
}
}