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

Fall back to board default language email template if the file does not exist user's preferred language (#35595)

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

1
phpBB/docs/CHANGELOG.html
View file

@ -146,6 +146,7 @@
<li>[Fix] Correctly hover list menu in UCP and MCP for rtl languages. (Bug #49945)</li> <li>[Fix] Correctly hover list menu in UCP and MCP for rtl languages. (Bug #49945)</li>
<li>[Fix] Correctly orientate quoted text image on RTL languages. (Bug #33745)</li> <li>[Fix] Correctly orientate quoted text image on RTL languages. (Bug #33745)</li>
<li>[Fix] Deprecate $allow_reply parameter to truncate_string() (Bug #56675)</li> <li>[Fix] Deprecate $allow_reply parameter to truncate_string() (Bug #56675)</li>
<li>[Fix] Fall back to default language email template if specified file does not exist. (Bug #35595)</li>
<li>[Fix] Update users last visit field correctly when changing activation status. (Bug #56185)</li> <li>[Fix] Update users last visit field correctly when changing activation status. (Bug #56185)</li>
<li>[Fix] Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL &lt;= 7.4 (Bug #54435)</li> <li>[Fix] Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL &lt;= 7.4 (Bug #54435)</li>
<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>

10
phpBB/includes/functions_messenger.php
View file

@ -182,9 +182,15 @@ class messenger
trigger_error('No template file for emailing set.', E_USER_ERROR); trigger_error('No template file for emailing set.', E_USER_ERROR);
} }
if (!trim($template_lang)) if (!trim($template_lang) || !file_exists("{$phpbb_root_path}language/{$template_lang}/email/$template_file.txt"))
{ {
$template_lang = basename($config['default_lang']); 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
} }
// 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