diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-20 14:18:03 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-20 14:18:03 +0000 |
| commit | 22cfe6dddb4a897c8f65803ac6fe7eda58899ff5 (patch) | |
| tree | 7695a0a2ba7e6d54b133a52a325f23ae4f6bc777 /phpBB/includes/functions_admin.php | |
| parent | 9e455b613a4ca80b7200550cd58b9976ff5e73c3 (diff) | |
| download | forums-22cfe6dddb4a897c8f65803ac6fe7eda58899ff5.tar forums-22cfe6dddb4a897c8f65803ac6fe7eda58899ff5.tar.gz forums-22cfe6dddb4a897c8f65803ac6fe7eda58899ff5.tar.bz2 forums-22cfe6dddb4a897c8f65803ac6fe7eda58899ff5.tar.xz forums-22cfe6dddb4a897c8f65803ac6fe7eda58899ff5.zip | |
Compression/decompression "libs" and a change to filelist
git-svn-id: file:///svn/phpbb/trunk@4287 89ea8834-ac86-4346-8a33-228a782c2dd0
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); } |