aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/index.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/install/index.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/install/index.php')
-rw-r--r--phpBB/install/index.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index fdce7234e5..6c32a322f8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -204,10 +204,10 @@ $config = new phpbb_config(array(
$phpbb_style_resource_locator = new phpbb_style_resource_locator();
$phpbb_style_path_provider = new phpbb_style_path_provider();
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
+$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);
$style->set_ext_dir_prefix('adm/');
$style->set_custom_style('admin', '../adm/style', '');
-$template = $style->template;
$template->assign_var('T_ASSETS_PATH', '../assets');
$template->assign_var('T_TEMPLATE_PATH', '../adm/style');