From 357cff9ddc76db4a5aef652f3d85892b28a33e9b Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 4 Oct 2006 09:36:21 +0000
Subject: [PATCH] move plugin sorting (by Name) to get_plugins() so that it
 works for the Edit Plugins page too.  fixes: #2412

git-svn-id: http://svn.automattic.com/wordpress/trunk@4325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-functions.php | 14 ++++++--------
 wp-admin/plugins.php         |  6 ------
 2 files changed, 6 insertions(+), 14 deletions(-)

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)) {
 <?php
 	$style = '';
 
-	function sort_plugins($plug1, $plug2) {
-		return strnatcasecmp($plug1['Name'], $plug2['Name']);
-	}
-
-	uasort($plugins, 'sort_plugins');
-
 	foreach($plugins as $plugin_file => $plugin_data) {
 		$style = ('class="alternate"' == $style|| 'class="alternate active"' == $style) ? '' : 'alternate';