aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-07-12 19:01:20 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-07-12 19:01:20 +0200
commite9eeff8b382eee4f8714b47390970474d791ed57 (patch)
tree251fcf016a9bf03a297fa15d38889ab08fa0c762 /tests
parent7e4acced8599e7275e20ebab10bdc925ece4baee (diff)
parentdf3f0a212ee55fbcd06f25abed23f9f1d1ca01ae (diff)
downloadforums-e9eeff8b382eee4f8714b47390970474d791ed57.tar
forums-e9eeff8b382eee4f8714b47390970474d791ed57.tar.gz
forums-e9eeff8b382eee4f8714b47390970474d791ed57.tar.bz2
forums-e9eeff8b382eee4f8714b47390970474d791ed57.tar.xz
forums-e9eeff8b382eee4f8714b47390970474d791ed57.zip
Merge remote-tracking branch 'EXreaction/ticket/11664' into develop
* EXreaction/ticket/11664: [ticket/11664] Stop creating php.html file in root path in tests
Diffstat (limited to 'tests')
-rw-r--r--tests/template/includephp_test.php2
-rw-r--r--tests/template/template_test.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php
index a3dc9bd5c5..ff7b890d11 100644
--- a/tests/template/includephp_test.php
+++ b/tests/template/includephp_test.php
@@ -39,7 +39,7 @@ class phpbb_template_includephp_test extends phpbb_template_template_test_case
$this->assertTrue(phpbb_is_absolute($path_to_php));
$template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->";
- $cache_dir = dirname($phpbb_root_path . 'cache') . '/';
+ $cache_dir = $phpbb_root_path . 'cache/';
$fp = fopen($cache_dir . 'includephp_absolute.html', 'w');
fputs($fp, $template_text);
fclose($fp);
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index fedfeba33a..802f0c19ba 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -403,7 +403,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
$template_text = '<!-- PHP -->echo "test";<!-- ENDPHP -->';
- $cache_dir = dirname($phpbb_root_path . 'cache') . '/';
+ $cache_dir = $phpbb_root_path . 'cache/';
$fp = fopen($cache_dir . 'php.html', 'w');
fputs($fp, $template_text);
fclose($fp);