From 05d583bba7faaf82487305e892f7758d4161f303 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sat, 8 Aug 2015 17:43:15 +0200
Subject: [ticket/14079] Correctly mark notifications as read

PHPBB3-14079
---
 phpBB/phpbb/notification/manager.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'phpBB/phpbb/notification/manager.php')

diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index eb9a93be3d..4be678ac91 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -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;
+				}
 			}
 		}
 
-- 
cgit v1.2.1