--- includes/file.inc	2008-02-07 10:20:38.000000000 -0800
+++ ../drupal-6.x/includes/file.inc	2008-03-06 14:20:21.171875000 -0800
@@ -884,7 +884,7 @@ function file_scan_directory($dir, $mask
   $files = array();
 
   if (is_dir($dir) && $handle = opendir($dir)) {
-    while ($file = readdir($handle)) {
+    while (false !== ($file = readdir($handle))) {
       if (!in_array($file, $nomask) && $file[0] != '.') {
         if (is_dir("$dir/$file") && $recurse) {
           // Give priority to files in this folder by merging them in after any subdirectory files.