mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/17135] Optimize save_queue() method calls

Browse Source 
PHPBB-17135
This commit is contained in:
rxu
2025-01-07 11:54:11 +07:00
parent 4dd08747e3
commit 3e0270d0cf
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/phpbb/notification/method/messenger_base.php
View File

@@ -86,7 +86,7 @@ abstract class messenger_base extends \phpbb\notification\method\base
$user_ids[] = $notification->user_id;
}
// We do not send emails to banned users
// We do not notify banned users
if (!function_exists('phpbb_get_banned_user_ids'))
{
include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
@@ -96,7 +96,9 @@ abstract class messenger_base extends \phpbb\notification\method\base
// Load all the users we need
$this->user_loader->load_users(array_diff($user_ids, $banned_users), array(USER_IGNORE));
// Time to go through the queue and send emails
// Time to go through the queue and send notifications
$messenger_collection_iterator = $this->messenger->getIterator();
/** @var type_interface $notification */
foreach ($this->queue as $notification)
{
@@ -112,7 +114,6 @@ abstract class messenger_base extends \phpbb\notification\method\base
continue;
}
$messenger_collection_iterator = $this->messenger->getIterator();
foreach ($messenger_collection_iterator as $messenger_method)
{
if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH)
@@ -125,13 +126,16 @@ abstract class messenger_base extends \phpbb\notification\method\base
], $notification->get_email_template_variables()));
$messenger_method->send();
// Save the queue in the messenger method class (has to be called or these messages could be lost)
$messenger_method->save_queue();
}
}
}
// Save the queue in the messenger method class (has to be called or these messages could be lost)
foreach ($messenger_collection_iterator as $messenger_method)
{
$messenger_method->save_queue();
}
// We're done, empty the queue
$this->empty_queue();
}