aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template/template_test_case.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-01 13:06:37 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-01 13:06:37 -0500
commit6f925552a5a9101b3e8083a0bf27b64b3ffd382a (patch)
tree3b611884d84556790505edebe19021468b5b57e5 /tests/template/template_test_case.php
parent341bae40eb8e8238510a2cb1678f9594a3efd29e (diff)
downloadforums-6f925552a5a9101b3e8083a0bf27b64b3ffd382a.tar
forums-6f925552a5a9101b3e8083a0bf27b64b3ffd382a.tar.gz
forums-6f925552a5a9101b3e8083a0bf27b64b3ffd382a.tar.bz2
forums-6f925552a5a9101b3e8083a0bf27b64b3ffd382a.tar.xz
forums-6f925552a5a9101b3e8083a0bf27b64b3ffd382a.zip
[feature/twig] Fix includephp_from_subdir_test.php
PHPBB3-11598
Diffstat (limited to 'tests/template/template_test_case.php')
-rw-r--r--tests/template/template_test_case.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 0a12dff9f4..d3f1cc4646 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -105,9 +105,13 @@ class phpbb_template_template_test_case extends phpbb_test_case
$this->template->destroy_block_vars($block);
}
- foreach ($lang_vars as $name => $value)
+ // Previous functionality was $cachefile (string), which was removed, check to prevent errors
+ if (is_array($lang_vars))
{
- $this->user->lang[$name] = $value;
+ foreach ($lang_vars as $name => $value)
+ {
+ $this->user->lang[$name] = $value;
+ }
}
$expected = str_replace(array("\n", "\r", "\t"), '', $expected);