2 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index b1979296b9..2b80b5bf3a 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -52,6 +52,13 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 			$user_ids[] = $notification->user_id;
 		}
 
+		// We do not send emails to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext'));
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
 		$sql = 'SELECT * FROM ' . USERS_TABLE . '
 			WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
 		$result = $this->db->sql_query($sql);
@@ -72,6 +79,11 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		// Time to go through the queue and send emails
 		foreach ($this->queue as $notification)
 		{
+			if (in_array($notification->user_id, $banned_users))
+			{
+				continue;
+			}
+
 			$notification->users($users);
 
 			$user = $notification->get_user($notification->user_id);
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 50c67de21a..92026c08d7 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -118,20 +118,8 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		$db = $phpbb_container->get('dbal.conn');
 		$user = $phpbb_container->get('user');
 
-		// Exclude guests, current user and banned users from notifications
-		unset($pm['recipients'][ANONYMOUS]);//, $pm['recipients'][$user->data['user_id']]);
-
-		if (!sizeof($pm['recipients']))
-		{
-			return;
-		}
-
-		if (!function_exists('phpbb_get_banned_user_ids'))
-		{
-			include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext'));
-		}
-		$banned_users = phpbb_get_banned_user_ids(array_keys($pm['recipients']));
-		$pm['recipients'] = array_diff(array_keys($pm['recipients']), $banned_users);
+		// Exclude guests and current user from notifications
+		unset($pm['recipients'][ANONYMOUS], $pm['recipients'][$user->data['user_id']]);
 
 		if (!sizeof($pm['recipients']))
 		{