diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-04-23 18:17:41 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-04-23 18:17:41 +0000 |
commit | 3cbfa1dac60a169b0fdec9ca080506483ece4d9e (patch) | |
tree | 009a751c156617eae837fdb557449f90759a48a7 | |
parent | d4a5a2be6555cae0bf38678b779110f55b01a2ab (diff) | |
download | brdo-3cbfa1dac60a169b0fdec9ca080506483ece4d9e.tar.gz brdo-3cbfa1dac60a169b0fdec9ca080506483ece4d9e.tar.bz2 |
- Patch #230932 by ryanlath: file_scan_directory() didn't scan the directory called '0'.
-rw-r--r-- | includes/file.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/file.inc b/includes/file.inc index 16f5c5629..0984190ce 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -884,7 +884,7 @@ function file_scan_directory($dir, $mask, $nomask = array('.', '..', 'CVS'), $ca $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. |