diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-01-26 03:43:02 +0000 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-01-26 03:43:02 +0000 |
| commit | a314b2807fc90ffa710394934d2680d7c363eb1d (patch) | |
| tree | 7cf22f746e47da5a0fc206c6dc2222e4f6fb5f99 /phpBB/includes/functions_messenger.php | |
| parent | ff1aa876b5e64532384f21d852650e28fd960743 (diff) | |
| download | forums-a314b2807fc90ffa710394934d2680d7c363eb1d.tar forums-a314b2807fc90ffa710394934d2680d7c363eb1d.tar.gz forums-a314b2807fc90ffa710394934d2680d7c363eb1d.tar.bz2 forums-a314b2807fc90ffa710394934d2680d7c363eb1d.tar.xz forums-a314b2807fc90ffa710394934d2680d7c363eb1d.zip | |
Remove needless check (revising r10447)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10448 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 85f5f091a0..3286e9171b 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -184,13 +184,10 @@ class messenger if (!trim($template_lang) || !file_exists("{$phpbb_root_path}language/{$template_lang}/email/$template_file.txt")) { - if (file_exists("{$phpbb_root_path}language/{$config['default_lang']}/email/$template_file.txt")) - { - // fall back to board default language if the user's language is - // missing $template_file - $template_lang = basename($config['default_lang']); - } - // Else $tpl->set_custom_template will do a trigger error + // fall back to board default language if the user's language is + // missing $template_file. If this does not exist either, + // $tpl->set_custom_template will do a trigger_error + $template_lang = basename($config['default_lang']); } // tpl_msg now holds a template object we can use to parse the template file |