mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Code Issues Releases Wiki Activity

[ticket/17489] Fix queue for ucp_resend, add type hints to $messenger_method

Browse Source 
PHPBB-17489
This commit is contained in:
rxu
2025-04-03 19:16:08 +07:00
parent 7467b567e8
commit c23504e3c7
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_activate.php
View File

@@ -133,6 +133,8 @@ class ucp_activate
$messenger = $phpbb_container->get('messenger.method_collection');
$messenger_collection_iterator = $messenger->getIterator();
/** @var \phpbb\messenger\method\base $messenger_method */
foreach ($messenger_collection_iterator as $messenger_method)
{
if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH)

10
phpBB/includes/ucp/ucp_resend.php
View File

@@ -138,6 +138,7 @@ class ucp_resend
$messenger_collection_iterator = $messenger->getIterator();
while ($row = $db->sql_fetchrow($result))
{
/** @var \phpbb\messenger\method\base $messenger_method */
foreach ($messenger_collection_iterator as $messenger_method)
{
$messenger_method->set_use_queue(false);
@@ -153,16 +154,13 @@ class ucp_resend
]);
$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();
}
}
}
$db->sql_freeresult($result);
// 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();
}
}
$this->update_activation_expiration();