makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3817 from Nicofuma/ticket/14076

Browse source 
[ticket/14076] Fix notification settings
This commit is contained in:
Máté Bartus 2015-08-07 16:39:55 +02:00
commit ec270713d0
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);
}
}