diff options
| author | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
| commit | afc12906b92c2cf126fa2ff9006583d0c4ef01ec (patch) | |
| tree | 0140929b3ddc902fb7f072af2425040d7a43d814 /tests/template/template_test_case_with_tree.php | |
| parent | dcf82d9a5ae26de462687325b4d8553e4aaca7d4 (diff) | |
| parent | aae7677d71112e468b56be7e10d16f3b381fcad7 (diff) | |
| download | forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.gz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.bz2 forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.xz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11628' into develop
Diffstat (limited to 'tests/template/template_test_case_with_tree.php')
| -rw-r--r-- | tests/template/template_test_case_with_tree.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index 4b8cbada45..477192c28a 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -20,10 +20,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat $this->template_path = $this->test_path . '/templates'; $this->parent_template_path = $this->test_path . '/parent_templates'; - $this->style_resource_locator = new phpbb_style_resource_locator(); - $this->style_provider = new phpbb_style_path_provider(); $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); - $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), array(), ''); + $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path)); } } |