From 22cfe6dddb4a897c8f65803ac6fe7eda58899ff5 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 20 Jul 2003 14:18:03 +0000 Subject: Compression/decompression "libs" and a change to filelist git-svn-id: file:///svn/phpbb/trunk@4287 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_admin.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'phpBB/includes/functions_admin.php') 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); } -- cgit v1.2.1