diff options
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 225a7e7fa5..54cc4c0e88 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -169,11 +169,9 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png') preg_match('#\.' . $type . '$#i', $fname) && filesize($rootdir . $dir . '/' . $fname)) { - $matches[] = array('path' => $dir, 'file' => $fname); + $matches[$dir][] = $fname; } - else if ($fname != '.' && $fname != '..' && - !is_file($rootdir . $dir . '/' . $fname) && - !is_link($rootdir . $dir . '/' . $fname)) + else if ($fname{0} != '.' && is_dir($rootdir . $dir . '/' . $fname)) { filelist($rootdir, $dir . '/'. $fname, $type); } |