From b23c4dacb921100da68ecacca6dbaf02eaa177a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dark=E2=9D=B6?= <dark-1@users.noreply.github.com>
Date: Sun, 15 Mar 2020 21:10:28 +0530
Subject: [PATCH] [ticket/16406] Fix Core Event of notification

PHPBB3-16406
---
 phpBB/phpbb/notification/manager.php | 41 ++++++++++++----------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index 9a212dcf8a..2d6d081d33 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -333,36 +333,31 @@ class manager
 		foreach ($this->get_subscription_methods_instances() as $method)
 		{
 			$notified_users = $method->get_notified_users($notification_type_id, array('item_id' => $item_id));
-			$notification_method_name = $method->get_type();
 
 			foreach ($notified_users as $user => $notifications)
 			{
 				unset($notify_users[$user]);
 			}
-
-			/**
-			* Allow filtering the $notify_users array by $notification_type_name & $notification_method_name for a notification that is about to be sent.
-			* Here, $notify_users is already filtered from users who've already been notified.
-			*
-			* @event core.notification_manager_add_notifications_for_users_modify_data
-			* @var	string	notification_type_name		The notification type identifier
-			* @var	string	notification_method_name	The notification method identifier (read only)
-			* @var	array 	data						Data specific for this type that will be inserted
-			* @var	array 	notify_users				User list to notify
-			* @var	array 	notified_users				The list of the users already notified (read only)
-			*
-			* @since 3.2.10-RC1
-			*/
-			$vars = [
-				'notification_type_name',
-				'notification_method_name',
-				'data',
-				'notify_users',
-				'notified_users',
-			];
-			extract($this->phpbb_dispatcher->trigger_event('core.notification_manager_add_notifications_for_users_modify_data', compact($vars)));
 		}
 
+		/**
+		* Allow filtering the $notify_users array by $notification_type_name for a notification that is about to be sent.
+		* Here, $notify_users is already filtered from users who've already been notified.
+		*
+		* @event core.notification_manager_add_notifications_for_users_modify_data
+		* @var	string	notification_type_name		The notification type identifier
+		* @var	array 	data						Data specific for this type that will be inserted
+		* @var	array 	notify_users				User list to notify
+		*
+		* @since 3.2.10-RC1
+		*/
+		$vars = [
+			'notification_type_name',
+			'data',
+			'notify_users',
+		];
+		extract($this->phpbb_dispatcher->trigger_event('core.notification_manager_add_notifications_for_users_modify_data', compact($vars)));
+
 		if (!count($notify_users))
 		{
 			return;