Ticket #24049: 24049v2.diff

wp-admin/includes/plugin.php

@@ -185 +185 @@
 function get_plugin_files($plugin) {
         $plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
         $dir = dirname($plugin_file);
-        $plugin_files = array($plugin);
+        $plugin_files = array();
+        $plugin_basedir = plugin_basename( $dir );
         if ( is_dir($dir) && $dir != WP_PLUGIN_DIR ) {
                 $plugins_dir = @ opendir( $dir );
                 if ( $plugins_dir ) {
@@ -198 +199 @@
                                                 while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
                                                         if ( substr($subfile, 0, 1) == '.' )
                                                                 continue;
-                                                        $plugin_files[] = plugin_basename("$dir/$file/$subfile");
+                                                        $plugin_files[] = "$plugin_basedir/$file/$subfile";
                                                 }
                                                 @closedir( $plugins_subdir );
                                         }
                                 } else {
-                                        if ( plugin_basename("$dir/$file") != $plugin )
-                                                $plugin_files[] = plugin_basename("$dir/$file");
+                                        if ( "$plugin_basedir/$file" != $plugin )
+                                                $plugin_files[] = "$plugin_basedir/$file";
                                 }
                         }
                         @closedir( $plugins_dir );
                 }
         }
-
+        sort( $plugin_files );
+        array_unshift( $plugin_files, $plugin );
         return $plugin_files;
 }