Mercurial > defr > drupal > core

diff includes/file.inc @ 7:fff6d4c8c043 6.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drupal 6.3
author Franck Deroche <webmaster@defr.org>
date Tue, 23 Dec 2008 14:30:28 +0100
parents c1f4ac30525a
children acef7ccb09b5
line wrap: on
line diff
--- a/includes/file.inc	Tue Dec 23 14:30:08 2008 +0100
+++ b/includes/file.inc	Tue Dec 23 14:30:28 2008 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: file.inc,v 1.121.2.1 2008/02/07 18:20:37 goba Exp $
+// $Id: file.inc,v 1.121.2.2 2008/04/23 18:18:09 dries Exp $
 
 /**
  * @file
@@ -884,7 +884,7 @@
   $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.