diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-27 02:23:57 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-27 02:23:57 +0200 |
| commit | f2b174c8b5e5f43752c38c8deebb7eeb82ec73da (patch) | |
| tree | 74c7f538ea6bf52a1b0189f628e76f908f834233 | |
| parent | 86234ea533c4b09d017f88bf0a1953a476bd045f (diff) | |
| parent | 960b20e45bda11a072102294d66837a2691893b9 (diff) | |
| download | forums-f2b174c8b5e5f43752c38c8deebb7eeb82ec73da.tar forums-f2b174c8b5e5f43752c38c8deebb7eeb82ec73da.tar.gz forums-f2b174c8b5e5f43752c38c8deebb7eeb82ec73da.tar.bz2 forums-f2b174c8b5e5f43752c38c8deebb7eeb82ec73da.tar.xz forums-f2b174c8b5e5f43752c38c8deebb7eeb82ec73da.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11618] Replace glob() with scandir() and string matching
Conflicts:
tests/template/template_test.php
| -rw-r--r-- | tests/template/template_test_case.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index 3c997cb00e..5d38ebed67 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -83,9 +83,14 @@ class phpbb_template_template_test_case extends phpbb_test_case $this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable."); } - foreach (glob($this->template->cachepath . '*') as $file) + $file_array = scandir($template_cache_dir); + $file_prefix = basename($this->template->cachepath); + foreach ($file_array as $file) { - unlink($file); + if (strpos($file, $file_prefix) === 0) + { + unlink($template_cache_dir . '/' . $file); + } } $this->setup_engine(); @@ -95,9 +100,15 @@ class phpbb_template_template_test_case extends phpbb_test_case { if (is_object($this->template)) { - foreach (glob($this->template->cachepath . '*') as $file) + $template_cache_dir = dirname($this->template->cachepath); + $file_array = scandir($template_cache_dir); + $file_prefix = basename($this->template->cachepath); + foreach ($file_array as $file) { - unlink($file); + if (strpos($file, $file_prefix) === 0) + { + unlink($template_cache_dir . '/' . $file); + } } } } |