diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 658e50c9d..083a07a11 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1705,25 +1705,23 @@ function get_plugins() { } } - if (!$plugins_dir || !$plugin_files) { + if ( !$plugins_dir || !$plugin_files ) return $wp_plugins; - } - sort($plugin_files); - - foreach ($plugin_files as $plugin_file) { - if ( !is_readable("$plugin_root/$plugin_file")) + foreach ( $plugin_files as $plugin_file ) { + if ( !is_readable("$plugin_root/$plugin_file") ) continue; $plugin_data = get_plugin_data("$plugin_root/$plugin_file"); - if (empty ($plugin_data['Name'])) { + if ( empty ($plugin_data['Name']) ) continue; - } $wp_plugins[plugin_basename($plugin_file)] = $plugin_data; } + uasort($wp_plugins, create_function('$a, $b', 'return strnatcasecmp($a["Name"], $b["Name"]);')); + return $wp_plugins; } diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 1e504d9dd..b8ad22558 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -90,12 +90,6 @@ if (empty($plugins)) { $plugin_data) { $style = ('class="alternate"' == $style|| 'class="alternate active"' == $style) ? '' : 'alternate';