1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 18:15:20 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2024-01-02 16:47:51 +01:00
commit e5ddf24fb9
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 14 additions and 2 deletions

View File

@ -410,12 +410,17 @@ class manager
foreach ($methods as $method) 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])) if (!isset($notification_methods[$method]))
{ {
$notification_methods[$method] = $this->get_method_class($method); $notification_methods[$method] = $this->get_method_class($method);
} }
$notification_methods[$method]->add_to_queue($notification); $notification_methods[$method]->add_to_queue($notification);
} }
} }

View File

@ -159,5 +159,12 @@
<value>notification.method.board</value> <value>notification.method.board</value>
<value>0</value> <value>0</value>
</row> </row>
<row>
<value>notification.type.bookmark</value>
<value>0</value>
<value>3</value>
<value>notification.method.nonexistent</value>
<value>1</value>
</row>
</table> </table>
</dataset> </dataset>