diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-06 19:28:46 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-06 19:34:20 -0500 |
| commit | 6e5fc53f0d1e456ea1047f061287488504b98f65 (patch) | |
| tree | 3faa8d3b0acf6ea3656c3b6c35bbcb86c443a50e /tests/template/template_inheritance_test.php | |
| parent | d6a6d63a9eee208fdfafed1441f19076a8f6d2e1 (diff) | |
| download | forums-6e5fc53f0d1e456ea1047f061287488504b98f65.tar forums-6e5fc53f0d1e456ea1047f061287488504b98f65.tar.gz forums-6e5fc53f0d1e456ea1047f061287488504b98f65.tar.bz2 forums-6e5fc53f0d1e456ea1047f061287488504b98f65.tar.xz forums-6e5fc53f0d1e456ea1047f061287488504b98f65.zip | |
[ticket/10685] Refactor template test defaults for php 5.4 compatibility.
PHPBB3-10685
Diffstat (limited to 'tests/template/template_inheritance_test.php')
| -rw-r--r-- | tests/template/template_inheritance_test.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php index b637166ba6..6987ae6c73 100644 --- a/tests/template/template_inheritance_test.php +++ b/tests/template/template_inheritance_test.php @@ -62,9 +62,12 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t $this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file); } - protected function setup_engine() + protected function setup_engine(array $new_config = array()) { - global $phpbb_root_path, $phpEx, $config, $user; + global $phpbb_root_path, $phpEx, $user; + + $defaults = $this->config_defaults(); + $config = new phpbb_config(array_merge($defaults, $new_config)); $this->template_path = dirname(__FILE__) . '/templates'; $this->parent_template_path = dirname(__FILE__) . '/parent_templates'; |