makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Messenger now also able to use a custom language path. (Bug #36545)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9450 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-04-17 09:08:34 +00:00
parent 0a139376ab
commit b8b578cd99
2 changed files with 4 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

@ -138,6 +138,7 @@
<li>[Fix] Set topic_last_view_time on post/reply/edit to circumvent race conditions in auto prune and false removal of topics for manual forum prune (Bug #18055, #43515)</li>
<li>[Fix] Correctly split long subject lines according to the used RFC. This fixes extra spaces within long subjects. (Bug #43715)</li>
<li>[Fix] Fix skipping messages if using next/prev PM in history links. (Bug #22205)</li>
<li>[Fix] Messenger now also able to use a custom language path. (Bug #36545)</li>
<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>
<li>[Change] Add link to user profile in the MCP for user notes and warn user.</li>

5
phpBB/includes/functions_messenger.php
View file

@ -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))
{