mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-30 03:30:17 +02:00
Code Issues Releases Wiki Activity

[ticket/14079] Correctly mark notifications as read

Browse Source 
PHPBB3-14079
This commit is contained in:
Tristan Darricau
2015-08-08 17:43:15 +02:00
parent ec270713d0
commit 05d583bba7
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,6 +166,7 @@ class manager
$notification_type_id = false;
}
/** @var method_interface $method */
foreach ($this->get_available_subscription_methods() as $method)
{
$method->mark_notifications($notification_type_id, $item_id, $user_id, $time, $mark_read);
@@ -597,26 +598,32 @@ class manager
{
foreach ($types as $id => $type)
{
$subscriptions[$id] = array();
$type_subscriptions = $default_methods;
if (!empty($user_notifications[$id]))
{
foreach ($user_notifications[$id] as $user_notification)
{
$key = array_search($user_notification['method'], $type_subscriptions, true);
if (!$user_notification['notify'])
{
if ($key !== false)
{
unset($type_subscriptions[$key]);
}
continue;
}
if (!isset($subscriptions[$id]))
else if ($key === false)
{
$subscriptions[$id] = array();
$type_subscriptions[] = $user_notification['method'];
}
$subscriptions[$id][] = $user_notification['method'];
}
}
$subscriptions[$id] = array_merge($subscriptions[$id], $default_methods);
if (!empty($type_subscriptions))
{
$subscriptions[$id] = $type_subscriptions;
}
}
}