From bf5c2e84451af9c9e5230cfc49d1bb54f326ab11 Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 4 May 2004 01:21:17 +0000 Subject: [PATCH] FIxed a logic bug when getting files ... bug 1305 --- lib/moodlelib.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 277b5556b4..5c4d838316 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -1542,13 +1542,15 @@ function get_directory_list($rootdir, $excludefile="", $descend=true, $justdirs= continue; } $fullfile = "$rootdir/$file"; - if ($descend and filetype($fullfile) == "dir") { + if (filetype($fullfile) == "dir") { if ($justdirs) { $dirs[] = $file; } - $subdirs = get_directory_list($fullfile, $excludefile, $descend, $justdirs); - foreach ($subdirs as $subdir) { - $dirs[] = "$file/$subdir"; + if ($descend) { + $subdirs = get_directory_list($fullfile, $excludefile, $descend, $justdirs); + foreach ($subdirs as $subdir) { + $dirs[] = "$file/$subdir"; + } } } else if (!$justdirs) { $dirs[] = $file; -- 2.39.5