aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template/template_inheritance_test.php
diff options
context:
space:
mode:
authorVjacheslav Trushkin <arty@phpbb.com>2012-03-15 13:13:21 +0200
committerVjacheslav Trushkin <arty@phpbb.com>2012-03-15 13:13:21 +0200
commit3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd (patch)
tree2436f29908131c404dc3bcb094ba380bb65744c1 /tests/template/template_inheritance_test.php
parent39944a08b9ea031dfc156f61ad0d8f4c594882e5 (diff)
downloadforums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar
forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar.gz
forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar.bz2
forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar.xz
forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.zip
[feature/merging-style-components] Creating style class
Creating phpbb_style class, changing template initialization to style initialization PHPBB3-10632
Diffstat (limited to 'tests/template/template_inheritance_test.php')
-rw-r--r--tests/template/template_inheritance_test.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index e2a2ac2261..2c67b38641 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -71,9 +71,8 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
$this->template_path = dirname(__FILE__) . '/templates';
$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
- $this->template_locator = new phpbb_style_locator();
- $this->template_provider = new phpbb_style_path_provider();
- $this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->template_locator, $this->template_provider);
+ $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
+ $this->template = $this->style->template;
$this->template->set_custom_template($this->template_path, 'tests', $this->parent_template_path, 'parent');
}
}