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

[ticket/17493] Remove remnants of notify type

Browse Source 
PHPBB-17493
This commit is contained in:
Marc Alexander
2025-04-21 15:16:41 +02:00
parent bde52e28f8
commit 3caab55e81
10 changed files with 10 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/notification/method/email.php
View File

@@ -136,7 +136,7 @@ class email extends \phpbb\notification\method\messenger_base
$insert_buffer->flush();
$this->notify_using_messenger(messenger_interface::NOTIFY_EMAIL);
$this->notify_using_messenger('messenger.method.email');
}
/**

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

@@ -67,12 +67,12 @@ abstract class messenger_base extends \phpbb\notification\method\base
/**
* Notify using phpBB messenger
*
* @param int $notify_method Notify method for messenger (e.g. \phpbb\messenger\method\messenger_interface::NOTIFY_IM)
* @param string $notify_method Notify method service for messenger (e.g. 'messenger.method.email'), empty string for all available methods
* @param string $template_dir_prefix Base directory to prepend to the email template name
*
* @return void
*/
protected function notify_using_messenger($notify_method, $template_dir_prefix = '')
protected function notify_using_messenger(string $notify_method, string $template_dir_prefix = ''): void
{
if (empty($this->queue))
{
@@ -120,7 +120,7 @@ abstract class messenger_base extends \phpbb\notification\method\base
*/
foreach ($messenger_collection_iterator as $messenger_method)
{
if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH)
if (empty($notify_method) || $messenger_collection_iterator->key() == $notify_method)
{
$messenger_method->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix);
$messenger_method->set_addresses($user);