aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-07-24 13:59:35 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-07-24 13:59:35 +0000
commit8c02ad5f86d123a867f85dc0e23648bec768801b (patch)
tree5d157a8f979e7ee92b9db31c900d62cfa08507b6 /phpBB/includes/functions_admin.php
parent275f62a5bdab5fe41e03402bdb1951ccd2b45cb8 (diff)
downloadforums-8c02ad5f86d123a867f85dc0e23648bec768801b.tar
forums-8c02ad5f86d123a867f85dc0e23648bec768801b.tar.gz
forums-8c02ad5f86d123a867f85dc0e23648bec768801b.tar.bz2
forums-8c02ad5f86d123a867f85dc0e23648bec768801b.tar.xz
forums-8c02ad5f86d123a867f85dc0e23648bec768801b.zip
filelist changes ... do away with static type
git-svn-id: file:///svn/phpbb/trunk@4326 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php6
1 files 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);
}
}