From 8c02ad5f86d123a867f85dc0e23648bec768801b Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 24 Jul 2003 13:59:35 +0000 Subject: [PATCH] filelist changes ... do away with static type git-svn-id: file:///svn/phpbb/trunk@4326 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 54cc4c0e88..de9eb95dd9 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -158,8 +158,8 @@ function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $incl } function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png') -{ - static $matches = array(); +{ + $matches = array(); $dh = opendir($rootdir . $dir); @@ -173,7 +173,7 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png') } else if ($fname{0} != '.' && is_dir($rootdir . $dir . '/' . $fname)) { - filelist($rootdir, $dir . '/'. $fname, $type); + $matches += filelist($rootdir, $dir . '/'. $fname, $type); } }