aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-03-31 18:10:00 +0300
committerVjacheslav Trushkin <arty@phpbb.com>2012-03-31 18:10:00 +0300
commit17989c17a040a28aeeefcf55f6cca054b28c06ed (patch)
treec774bb4f60dba6973fcb095cc27768428ff71cc5 /phpBB/common.php
parent0540509f145d7eb9ba1fd4468399b48edcf46d23 (diff)
downloadforums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar
forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.gz
forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.bz2
forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.xz
forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.zip
[feature/merging-style-components] Moving template initialization out of style
Moving template initialization out of style constructor PHPBB3-10632
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 1e3f787611..c11d39d9a1 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -126,8 +126,8 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro
// Initialize style
$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;
+$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
$phpbb_subscriber_loader->load();