diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-09-16 08:11:52 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-09-16 08:11:52 +0000 |
| commit | 697fd5a134bde47006f57b6dd8df4e2dec6a7f3d (patch) | |
| tree | 31ce382faa83f35cc974f584a8ac22d64305a1fe /phpBB/includes/functions_messenger.php | |
| parent | b27e96cf62399013646439ff352ebbc558e1e2c6 (diff) | |
| download | forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar.gz forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar.bz2 forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar.xz forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.zip | |
Fix #51285 and more issues with template inherence on set_custom_template
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
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 0fcf33f999..0d1c215cb1 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -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', |