diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 17:22:54 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 17:22:54 +0200 |
| commit | 0ae491c5fa9228304e17431ea7aa8ba9303cc193 (patch) | |
| tree | 9d3fcccb13d8bda12ae7f0dec3321c7375d8e621 /phpBB/includes/functions_messenger.php | |
| parent | e7a4437c1bccace4a0637241a8f386e686d9c3fb (diff) | |
| parent | 5d07b16ec647f51d51504cf9d6a0861a975ceb8e (diff) | |
| download | forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.gz forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.bz2 forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.xz forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.zip | |
Merge remote-tracking branch 'cyberalien/feature/merging-style-components' into develop
* cyberalien/feature/merging-style-components: (31 commits)
[feature/merging-style-components] Fix back link on install page
[feature/merging-style-components] Fix for unit tests
[feature/merging-style-components] Moving template initialization out of style
[feature/merging-style-components] Renaming "delete" to "uninstall" for styles
[feature/merging-style-components] Initializing locator and provider separately
[feature/merging-style-components] Fixing few errors in acp_styles
[feature/merging-style-components] Fix notices in acp_styles
[feature/merging-style-components] Updating styles in coding guidelines
[feature/merging-style-components] Changing acp_styles text
[feature/merging-style-components] Updating test cases
[feature/merging-style-components] Updating style initialization
[feature/merging-style-components] Changing style class
[feature/merging-style-components] Changing template class
[feature/merging-style-components] Changing resource locator
[feature/merging-style-components] Changing path provider
[feature/merging-style-components] Renaming style locator
[feature/merging-style-components] Changing $style to $style_id
[feature/merging-style-components] Creating style class
[feature/merging-style-components] New acp_styles template
[feature/merging-style-components] New acp_styles
...
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index f4e49b1b18..aae200df55 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -201,17 +201,18 @@ 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']); } // tpl_msg now holds a template object we can use to parse the template file if (!isset($this->tpl_msg[$template_lang . $template_file])) { - $template_locator = new phpbb_template_locator(); - $template_path_provider = new phpbb_template_extension_path_provider($phpbb_extension_manager, new phpbb_template_path_provider()); - $this->tpl_msg[$template_lang . $template_file] = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator, $template_path_provider); - $tpl = &$this->tpl_msg[$template_lang . $template_file]; + $style_resource_locator = new phpbb_style_resource_locator(); + $style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); + $tpl = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); + $stl = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl); + $this->tpl_msg[$template_lang . $template_file] = $tpl; $fallback_template_path = false; @@ -229,7 +230,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', |