mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus

Browse Source 
* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
This commit is contained in:
Andreas Fischer
2013-06-27 02:08:48 +02:00
parent e0c572d1d8 8e575487ff
commit 960b20e45b
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/template/template_test.php
View File

@@ -69,9 +69,14 @@ class phpbb_template_template_test extends phpbb_test_case
$this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable."); $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);
}
} }
$GLOBALS['config'] = array( $GLOBALS['config'] = array(
@@ -84,9 +89,15 @@ class phpbb_template_template_test extends phpbb_test_case
{ {
if (is_object($this->template)) 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);
}
} }
} }
} }