Ticket #16938: 16938.patch

wp-admin/includes/file.php

@@ -126 +126 @@
  * @return bool|array False on failure, Else array of files
  */
 function list_files( $folder = '', $levels = 100 ) {
-        if ( empty($folder) )
+        if ( empty($folder) || empty($levels) )
                 return false;
 
-        if ( ! $levels )
-                return false;
-
         $files = array();
-        if ( $dir = @opendir( $folder ) ) {
-                while (($file = readdir( $dir ) ) !== false ) {
-                        if ( in_array($file, array('.', '..') ) )
+        if ( $handle = @opendir( $folder ) ) {
+                while ( $file = readdir( $handle ) ) {
+                        if ( $file === '.' || $file === '..' )
                                 continue;
-                        if ( is_dir( $folder . '/' . $file ) ) {
-                                $files2 = list_files( $folder . '/' . $file, $levels - 1);
-                                if ( $files2 )
-                                        $files = array_merge($files, $files2 );
-                                else
-                                        $files[] = $folder . '/' . $file . '/';
-                        } else {
-                                $files[] = $folder . '/' . $file;
+                        $path = $folder . '/' . $file;
+                        if ( is_dir( $path ) ) {
+                                if ( $files_subdir = list_files( $path, $levels - 1) ) {
+                                        $files = array_merge( $files, $files_subdir );
+                                        continue;
+                                }
+                                $path .= '/';
                         }
+                        $files[] = $path;
                 }
+                @closedir( $handle );
         }
-        @closedir( $dir );
         return $files;
 }