aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template/template_inheritance_test.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 /tests/template/template_inheritance_test.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 'tests/template/template_inheritance_test.php')
-rw-r--r--tests/template/template_inheritance_test.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index aa527a3eb5..3f5ec53953 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -73,8 +73,8 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
$this->style_resource_locator = new phpbb_style_path_provider();
$this->style_provider = new phpbb_style_path_provider();
- $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+ $this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+ $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
- $this->template = $this->style->template;
}
}