--- includes/file.inc	2007-10-08 07:13:14.000000000 -0600
+++ includes/file.inc	2007-10-10 21:38:50.890625000 -0600
@@ -884,7 +884,7 @@ function file_scan_directory($dir, $mask
     while ($file = readdir($handle)) {
       if (!in_array($file, $nomask) && $file[0] != '.') {
         if (is_dir("$dir/$file") && $recurse) {
-          $files = array_merge($files, file_scan_directory("$dir/$file", $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1));
+          $files = array_merge(file_scan_directory("$dir/$file", $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1), $files);
         }
         elseif ($depth >= $min_depth && ereg($mask, $file)) {
           $filename = "$dir/$file";