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

[ticket/14443] Introduce additional parameter to messenger

Browse Source 
PHPBB3-14443
This commit is contained in:
Martin Beckmann 2016-02-01 23:11:39 +01:00
parent 89a34ff033
commit fdd5a18763
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/functions_messenger.php
View File

@ -210,7 +210,7 @@ class messenger
/** /**
* Set email template to use * Set email template to use
*/ */
function template($template_file, $template_lang = '', $template_path = '') function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '')
{ {
global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager; global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager;
@ -232,7 +232,7 @@ class messenger
if ($template_path) if ($template_path)
{ {
$template_paths = array( $template_paths = array(
$template_path, $template_path . '/' . $template_dir_prefix,
); );
} }
else else
@ -241,7 +241,7 @@ class messenger
$template_path .= $template_lang . '/email'; $template_path .= $template_lang . '/email';
$template_paths = array( $template_paths = array(
$template_path, $template_path . '/' . $template_dir_prefix,
); );
// we can only specify default language fallback when the path is not a custom one for which we // we can only specify default language fallback when the path is not a custom one for which we
@ -251,14 +251,14 @@ class messenger
$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; $fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
$fallback_template_path .= basename($config['default_lang']) . '/email'; $fallback_template_path .= basename($config['default_lang']) . '/email';
$template_paths[] = $fallback_template_path; $template_paths[] = $fallback_template_path . '/' . $template_dir_prefix;
} }
} }
$this->set_template_paths(array( $this->set_template_paths(array(
array( array(
'name' => $template_lang . '_email', 'name' => $template_lang . '_email',
'ext_path' => 'language/' . $template_lang . '/email' 'ext_path' => 'language/' . $template_lang . '/email' . '/' . $template_dir_prefix,
), ),
), $template_paths); ), $template_paths);

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

@ -74,7 +74,7 @@ abstract class messenger_base extends \phpbb\notification\method\base
continue; continue;
} }
$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']); $messenger->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix);
$messenger->set_addresses($user); $messenger->set_addresses($user);