diff options
| author | Martin Beckmann <gn#36@phpbb.de> | 2016-02-01 23:11:39 +0100 |
|---|---|---|
| committer | Martin Beckmann <gn#36@phpbb.de> | 2016-02-01 23:11:39 +0100 |
| commit | fdd5a1876388e20b8b79f39bdc6e63c1ce964a91 (patch) | |
| tree | 1208073443aaa85d21d477fcafcd4a02542df03a /phpBB/includes/functions_messenger.php | |
| parent | 89a34ff033b4b2cc854c79556bb75cd235c86509 (diff) | |
| download | forums-fdd5a1876388e20b8b79f39bdc6e63c1ce964a91.tar forums-fdd5a1876388e20b8b79f39bdc6e63c1ce964a91.tar.gz forums-fdd5a1876388e20b8b79f39bdc6e63c1ce964a91.tar.bz2 forums-fdd5a1876388e20b8b79f39bdc6e63c1ce964a91.tar.xz forums-fdd5a1876388e20b8b79f39bdc6e63c1ce964a91.zip | |
[ticket/14443] Introduce additional parameter to messenger
PHPBB3-14443
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index ae393739b9..1f70b64ea8 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -210,7 +210,7 @@ class messenger /** * 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; @@ -232,7 +232,7 @@ class messenger if ($template_path) { $template_paths = array( - $template_path, + $template_path . '/' . $template_dir_prefix, ); } else @@ -241,7 +241,7 @@ class messenger $template_path .= $template_lang . '/email'; $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 @@ -251,14 +251,14 @@ class messenger $fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; $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( array( 'name' => $template_lang . '_email', - 'ext_path' => 'language/' . $template_lang . '/email' + 'ext_path' => 'language/' . $template_lang . '/email' . '/' . $template_dir_prefix, ), ), $template_paths); |