Ticket #39316: plugin.php.patch

plugin.php

@@ -195 +195 @@
         $dir = dirname($plugin_file);
         $plugin_files = array($plugin);
         if ( is_dir($dir) && $dir != WP_PLUGIN_DIR ) {
-                $plugins_dir = @ opendir( $dir );
-                if ( $plugins_dir ) {
-                        while (($file = readdir( $plugins_dir ) ) !== false ) {
-                                if ( substr($file, 0, 1) == '.' )
-                                        continue;
-                                if ( is_dir( $dir . '/' . $file ) ) {
-                                        $plugins_subdir = @ opendir( $dir . '/' . $file );
-                                        if ( $plugins_subdir ) {
-                                                while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-                                                        if ( substr($subfile, 0, 1) == '.' )
-                                                                continue;
-                                                        $plugin_files[] = plugin_basename("$dir/$file/$subfile");
-                                                }
-                                                @closedir( $plugins_subdir );
-                                        }
-                                } else {
-                                        if ( plugin_basename("$dir/$file") != $plugin )
-                                                $plugin_files[] = plugin_basename("$dir/$file");
-                                }
-                        }
-                        @closedir( $plugins_dir );
-                }
+        $objects = new RecursiveIteratorIterator( new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::SELF_FIRST );
+        foreach( $objects as $name => $object ){
+            if( is_dir( $name ) )
+                continue;
+
+            if ( substr( $name, 0, 1 ) == '.' )
+                continue;
+
+            $plugin_files[] = plugin_basename( $name );
+        }
         }
 
         return $plugin_files;