diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-07-10 00:35:07 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-07-10 00:35:07 +0200 |
| commit | ae53623230a45eeedf50cc3f6220164d8cd256c3 (patch) | |
| tree | 130080560cc500d1da9b1e83f05c29d29a688e64 /tests/template/subdir | |
| parent | ee0bba3ab65f68a24942a650b9414b8f2ad700b4 (diff) | |
| download | forums-ae53623230a45eeedf50cc3f6220164d8cd256c3.tar forums-ae53623230a45eeedf50cc3f6220164d8cd256c3.tar.gz forums-ae53623230a45eeedf50cc3f6220164d8cd256c3.tar.bz2 forums-ae53623230a45eeedf50cc3f6220164d8cd256c3.tar.xz forums-ae53623230a45eeedf50cc3f6220164d8cd256c3.zip | |
[feature/template-engine] Refactor $config dependency out of the filter
The template stream filter no longer depends on the $config global.
Instead it uses a 'allow_php' param that is passed via
stream_bucket_append's last argument.
Tests also adjusted.
PHPBB3-9726
Diffstat (limited to 'tests/template/subdir')
| -rw-r--r-- | tests/template/subdir/includephp_from_subdir_test.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/template/subdir/includephp_from_subdir_test.php b/tests/template/subdir/includephp_from_subdir_test.php index d6148c7032..3cc632485d 100644 --- a/tests/template/subdir/includephp_from_subdir_test.php +++ b/tests/template/subdir/includephp_from_subdir_test.php @@ -17,7 +17,7 @@ class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_t // board root. public function test_includephp_relative() { - $GLOBALS['config']['tpl_allow_php'] = true; + $this->setup_engine(array('tpl_allow_php' => true)); $cache_file = $this->template->cachepath . 'includephp_relative.html.php'; @@ -25,7 +25,5 @@ class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_t $this->template->set_filenames(array('test' => 'includephp_relative.html')); $this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); - - $GLOBALS['config']['tpl_allow_php'] = false; } } |
