diff options
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index de9eb95dd9..85378c2491 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -165,15 +165,13 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png') while ($fname = readdir($dh)) { - if (is_file($rootdir . $dir . '/' . $fname) && - preg_match('#\.' . $type . '$#i', $fname) && - filesize($rootdir . $dir . '/' . $fname)) + if (is_file("$rootdir$dir/$fname") && filesize("$rootdir$dir/$fname") && preg_match('#\.' . $type . '$#i', $fname)) { $matches[$dir][] = $fname; } - else if ($fname{0} != '.' && is_dir($rootdir . $dir . '/' . $fname)) + else if ($fname{0} != '.' && is_dir("$rootdir$dir/$fname")) { - $matches += filelist($rootdir, $dir . '/'. $fname, $type); + $matches += filelist($rootdir, "$dir/$fname", $type); } } |