aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.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/common.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/common.php')
-rw-r--r--phpBB/common.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 3f039e49c0..1e3f787611 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -124,7 +124,9 @@ set_config_count(null, null, null, $config);
$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
// Initialize style
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
+$phpbb_style_resource_locator = new phpbb_style_resource_locator();
+$phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
$template = $style->template;
$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);