makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove needless check (revising r10447)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10448 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Josh Woody 2010-01-26 03:43:02 +00:00
parent ff1aa876b5
commit a314b2807f
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_messenger.php
View file

@ -183,15 +183,12 @@ class messenger
} }
if (!trim($template_lang) || !file_exists("{$phpbb_root_path}language/{$template_lang}/email/$template_file.txt")) 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 // fall back to board default language if the user's language is
// missing $template_file // missing $template_file. If this does not exist either,
// $tpl->set_custom_template will do a trigger_error
$template_lang = basename($config['default_lang']); $template_lang = basename($config['default_lang']);
} }
// Else $tpl->set_custom_template will do a trigger error
}
// tpl_msg now holds a template object we can use to parse the template file // tpl_msg now holds a template object we can use to parse the template file
if (!isset($this->tpl_msg[$template_lang . $template_file])) if (!isset($this->tpl_msg[$template_lang . $template_file]))