Ticket #9766: 9766.diff

wp-admin/includes/widgets.php

@@ -18 +18 @@
  */
 function wp_list_widgets() {
         global $wp_registered_widgets, $sidebars_widgets, $wp_registered_widget_controls;
+        
+        usort($wp_registered_widgets, 'wp_sort_widgets');
 
         $done = array();
-        $sort = array_keys($wp_registered_widgets);
-        natcasesort($sort); ?>
+        ?>
 
         <div class="widget-holder">
         <p class="description"><?php _e('Drag widgets from here to a sidebar on the right to activate them.'); ?></p>
         <div id="widget-list">
 <?php
-        foreach ( $sort as $val ) {
-                $widget = $wp_registered_widgets[$val];
+        foreach ( $wp_registered_widgets as $widget ) {
                 if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
                         continue;
 
@@ -61 +61 @@
 }
 
 /**
+ * sort widget callback
+ *
+ * @param array $a first widget
+ * @param array $b second widget
+ * @return int -1|0|1 depending a and b's name
+ **/
+
+function wp_sort_widgets($a, $b) {
+        return strnatcmp($a['name'], $b['name']);
+}
+
+/**
  * {@internal Missing Short Description}}
  *
  * @since unknown