aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_messenger.php
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-03-31 17:38:30 +0300
committerVjacheslav Trushkin <arty@phpbb.com>2012-03-31 17:38:30 +0300
commit360312f599edd852e14fcd162552e19dd2d278a6 (patch)
tree89202a7ba57cd9c469b2d21fd4d6c432b410dfb7 /phpBB/includes/functions_messenger.php
parent961199755200668790b243447eac6bf3374b0bb6 (diff)
downloadforums-360312f599edd852e14fcd162552e19dd2d278a6.tar
forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.gz
forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.bz2
forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.xz
forums-360312f599edd852e14fcd162552e19dd2d278a6.zip
[feature/merging-style-components] Initializing locator and provider separately
Moving locator and path provider initialization out of style class PHPBB3-10632
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
-rw-r--r--phpBB/includes/functions_messenger.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index a5e7ad75ca..4d076a7957 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -208,7 +208,9 @@ class messenger
// tpl_msg now holds a template object we can use to parse the template file
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);
+ $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());
+ $this->tpl_msg[$template_lang . $template_file] = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider);
$stl = &$this->tpl_msg[$template_lang . $template_file];
$tpl = $stl->template;