Changeset 4324

Timestamp:

10/04/2006 09:35:25 AM (18 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:

branches/2.0/wp-admin

Files:

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

branches/2.0/wp-admin/admin-functions.php

@@ -1571 +1571 @@
     }
 
-    if (!$plugins_dir || !$plugin_files) {
+    if ( !$plugins_dir || !$plugin_files )
         return $wp_plugins;
-    }
-
-    sort($plugin_files);
-
-    foreach ($plugin_files as $plugin_file) {
+
+    foreach ( $plugin_files as $plugin_file ) {
         if ( !is_readable("$plugin_root/$plugin_file"))
             continue;
@@ -1583 +1580 @@
         $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;

branches/2.0/wp-admin/plugins.php

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