mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Fix #51285 and more issues with template inherence on set_custom_template

Browse Source 
Conflict introduced with r9839 and r9823

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10150 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling
2009-09-16 08:11:52 +00:00
parent b27e96cf62
commit 697fd5a134
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_messenger.php
View File

@@ -199,7 +199,7 @@ class messenger
$template_path .= $template_lang . '/email';
}
$tpl->set_custom_template($template_path, $template_lang . '_email');
$tpl->set_custom_template($template_path, $template_lang . '_email', 'email');
$tpl->set_filenames(array(
'body' => $template_file . '.txt',