diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-17 09:08:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-17 09:08:34 +0000 |
| commit | b8b578cd99641370756d116b31917f2a18fa9446 (patch) | |
| tree | 10f726ae9d8d8c8086f6cdb9004bd1bb5359caf0 /phpBB/includes/functions_messenger.php | |
| parent | 0a139376abd49b089cd6d9de1d064f6f3098a629 (diff) | |
| download | forums-b8b578cd99641370756d116b31917f2a18fa9446.tar forums-b8b578cd99641370756d116b31917f2a18fa9446.tar.gz forums-b8b578cd99641370756d116b31917f2a18fa9446.tar.bz2 forums-b8b578cd99641370756d116b31917f2a18fa9446.tar.xz forums-b8b578cd99641370756d116b31917f2a18fa9446.zip | |
Messenger now also able to use a custom language path. (Bug #36545)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9450 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index d2c738967c..4fd5fd19e0 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -173,7 +173,7 @@ class messenger */ function template($template_file, $template_lang = '') { - global $config, $phpbb_root_path; + global $config, $phpbb_root_path, $user; if (!trim($template_file)) { @@ -187,7 +187,8 @@ class messenger if (empty($this->tpl_msg[$template_lang . $template_file])) { - $tpl_file = "{$phpbb_root_path}language/$template_lang/email/$template_file.txt"; + $tpl_file = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; + $tpl_file .= $template_lang . "/email/$template_file.txt"; if (!file_exists($tpl_file)) { |