1 files changed, 64 insertions, 28 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index 09d9677ccd..b787b624f6 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -11,7 +15,6 @@ namespace phpbb\notification;
 
 /**
 * Notifications service class
-* @package notifications
 */
 class manager
 {
@@ -571,6 +574,34 @@ class manager
 		return $subscription_methods;
 	}
 
+
+	/**
+	* Get user's notification data
+	*
+	* @param int $user_id The user_id of the user to get the notifications for
+	*
+	* @return array User's notification
+	*/
+	protected function get_user_notifications($user_id)
+	{
+		$sql = 'SELECT method, notify, item_type
+				FROM ' . $this->user_notifications_table . '
+				WHERE user_id = ' . (int) $user_id . '
+					AND item_id = 0';
+
+		$result = $this->db->sql_query($sql);
+		$user_notifications = array();
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$user_notifications[$row['item_type']][] = $row;
+		}
+
+		$this->db->sql_freeresult($result);
+
+		return $user_notifications;
+	}
+
 	/**
 	* Get global subscriptions (item_id = 0)
 	*
@@ -584,28 +615,23 @@ class manager
 
 		$subscriptions = array();
 
-		foreach ($this->get_subscription_types() as $group_name => $types)
+		$user_notifications = $this->get_user_notifications($user_id);
+
+		foreach ($this->get_subscription_types() as $types)
 		{
 			foreach ($types as $id => $type)
 			{
-				$sql = 'SELECT method, notify
-					FROM ' . $this->user_notifications_table . '
-					WHERE user_id = ' . (int) $user_id . "
-						AND item_type = '" . $this->db->sql_escape($id) . "'
-						AND item_id = 0";
-				$result = $this->db->sql_query($sql);
-
-				$row = $this->db->sql_fetchrow($result);
-				if (!$row)
+
+				if (empty($user_notifications[$id]))
 				{
 					// No rows at all, default to ''
 					$subscriptions[$id] = array('');
 				}
 				else
 				{
-					do
+					foreach ($user_notifications[$id] as $user_notification)
 					{
-						if (!$row['notify'])
+						if (!$user_notification['notify'])
 						{
 							continue;
 						}
@@ -615,12 +641,9 @@ class manager
 							$subscriptions[$id] = array();
 						}
 
-						$subscriptions[$id][] = $row['method'];
+						$subscriptions[$id][] = $user_notification['method'];
 					}
-					while ($row = $this->db->sql_fetchrow($result));
 				}
-
-				$this->db->sql_freeresult($result);
 			}
 		}
 
@@ -760,17 +783,30 @@ class manager
 	*/
 	public function purge_notifications($notification_type_name)
 	{
-		$notification_type_id = $this->get_notification_type_id($notification_type_name);
+		// If a notification is never used, its type will not be added to the database
+		// nor its id cached. If this method is called by an extension during the
+		// purge step, and that extension never used its notifications,
+		// get_notification_type_id() will throw an exception. However,
+		// because no notification type was added to the database,
+		// there is nothing to delete, so we can silently drop the exception.
+		try
+		{
+			$notification_type_id = $this->get_notification_type_id($notification_type_name);
 
-		$sql = 'DELETE FROM ' . $this->notifications_table . '
-			WHERE notification_type_id = ' . (int) $notification_type_id;
-		$this->db->sql_query($sql);
+			$sql = 'DELETE FROM ' . $this->notifications_table . '
+				WHERE notification_type_id = ' . (int) $notification_type_id;
+			$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . $this->notification_types_table . '
-			WHERE notification_type_id = ' . (int) $notification_type_id;
-		$this->db->sql_query($sql);
+			$sql = 'DELETE FROM ' . $this->notification_types_table . '
+				WHERE notification_type_id = ' . (int) $notification_type_id;
+			$this->db->sql_query($sql);
 
-		$this->cache->destroy('notification_type_ids');
+			$this->cache->destroy('notification_type_ids');
+		}
+		catch (\phpbb\notification\exception $e)
+		{
+			// Continue
+		}
 	}
 
 	/**