diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 21:11:34 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 21:11:34 +0200 |
| commit | fd96f97dc3c659e1d2e9b58420d652ad79387fbf (patch) | |
| tree | 96bc528157271485983689b59967c5692f2fc21d /phpBB/includes/functions_messenger.php | |
| parent | 1ce4d4c4fc482f33fd061c4f718b4f8c3656dbdb (diff) | |
| download | forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.gz forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.bz2 forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.xz forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.zip | |
[feature/merging-style-components] Updating style initialization
Changing template initialization to style initialization.
PHPBB3-10632
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 4e1ec160af..a5e7ad75ca 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -201,7 +201,7 @@ class messenger { // fall back to board default language if the user's language is // missing $template_file. If this does not exist either, - // $tpl->set_custom_template will do a trigger_error + // $tpl->set_filenames will do a trigger_error $template_lang = basename($config['default_lang']); } @@ -209,8 +209,8 @@ class messenger if (!isset($this->tpl_msg[$template_lang . $template_file])) { $this->tpl_msg[$template_lang . $template_file] = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager); - $tpl = &$this->tpl_msg[$template_lang . $template_file]; - $tpl = $tpl->template; + $stl = &$this->tpl_msg[$template_lang . $template_file]; + $tpl = $stl->template; $fallback_template_path = false; @@ -228,7 +228,7 @@ class messenger } } - $tpl->set_custom_template($template_path, $template_lang . '_email', $fallback_template_path); + $stl->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), ''); $tpl->set_filenames(array( 'body' => $template_file . '.txt', |