Merge branch '3.3.x'

marc1706 · Jan 2, 2024 · e5ddf24 · e5ddf24
2 parents 39cad1d + c4642d2
commit e5ddf24
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
@@ -410,12 +410,17 @@ public function add_notifications_for_users($notification_type_name, $data, $not
 
 			foreach ($methods as $method)
 			{
-				// setup the notification methods and add the notification to the queue
+				// Do not load non-existent notification methods
+				if (!isset($this->notification_methods[$method]))
+				{
+					continue;
+				}
+
+				// Setup the notification methods and add the notification to the queue
 				if (!isset($notification_methods[$method]))
 				{
 					$notification_methods[$method] = $this->get_method_class($method);
 				}
-
 				$notification_methods[$method]->add_to_queue($notification);
 			}
 		}

diff --git a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
@@ -159,5 +159,12 @@
 			<value>notification.method.board</value>
 			<value>0</value>
 		</row>
+		<row>
+			<value>notification.type.bookmark</value>
+			<value>0</value>
+			<value>3</value>
+			<value>notification.method.nonexistent</value>
+			<value>1</value>
+		</row>
 	</table>
 </dataset>