diff options
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 3286e9171b..4b69b26eb6 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -182,7 +182,16 @@ class messenger trigger_error('No template file for emailing set.', E_USER_ERROR); } - if (!trim($template_lang) || !file_exists("{$phpbb_root_path}language/{$template_lang}/email/$template_file.txt")) + if (!$template_path) + { + $path_check = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; + } + else + { + $path_check = $template_path; + } + + if (!trim($template_lang) || !file_exists("$path_check$template_lang/email/$template_file.txt")) { // fall back to board default language if the user's language is // missing $template_file. If this does not exist either, |