Changeset 4325

Timestamp:

10/04/2006 09:36:21 AM (20 years ago)

Author:

markjaquith

Message:

move plugin sorting (by Name) to get_plugins() so that it works for the Edit Plugins page too. fixes: #2412

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (1 diff)
• plugins.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -1706 +1706 @@
         }
 
-        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;

trunk/wp-admin/plugins.php

@@ -91 +91 @@
         $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';