Changes in trunk/wp-admin/includes/widgets.php [16660:14374]

File:

• trunk/wp-admin/includes/widgets.php (modified) (7 diffs)

trunk/wp-admin/includes/widgets.php

@@ -8 +8 @@
 
 /**
- * Display list of the available widgets.
- *
- * @since 2.5.0
+ * Display list of the available widgets, either all or matching search.
+ *
+ * The search parameter are search terms separated by spaces.
+ *
+ * @since unknown
+ *
+ * @param string $show Optional, default is all. What to display, can be 'all', 'unused', or 'used'.
+ * @param string $_search Optional. Search for widgets. Should be unsanitized.
  */
 function wp_list_widgets() {
@@ -16 +21 @@
 
     $sort = $wp_registered_widgets;
-    usort( $sort, '_sort_name_callback' );
+    usort( $sort, create_function( '$a, $b', 'return strnatcasecmp( $a["name"], $b["name"] );' ) );
     $done = array();
 
@@ -48 +53 @@
 
 /**
- * Callback to sort array by a 'name' key.
- *
- * @since 3.1.0
- * @access private
- */
-function _sort_name_callback( $a, $b ) {
-    return strnatcasecmp( $a['name'], $b['name'] );
-}
-
-/**
  * Show the widgets and their settings for a sidebar.
  * Used in the the admin widget config screen.
  *
- * @since 2.5.0
+ * @since unknown
  *
  * @param string $sidebar id slug of the sidebar
@@ -85 +80 @@
  * {@internal Missing Short Description}}
  *
- * @since 2.5.0
+ * @since unknown
  *
  * @param array $params
@@ -99 +94 @@
     $hidden = isset($params[0]['_hide']) ? ' style="display:none;"' : '';
 
-    $params[0]['before_widget'] = "<div id='widget-{$i}_{$id}' class='widget'$hidden>";
+    $params[0]['before_widget'] = "<div id='widget-${i}_$id' class='widget'$hidden>";
     $params[0]['after_widget'] = "</div>";
     $params[0]['before_title'] = "%BEG_OF_TITLE%"; // deprecated
@@ -129 +124 @@
  * Called from dynamic_sidebar().
  *
- * @since 2.5.0
+ * @since unknown
  *
  * @param array $sidebar_args
@@ -209 +204 @@
         <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
         <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback " title="" alt="" />
-        <?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false ); ?>
+        <input type="submit" name="savewidget" class="button-primary widget-control-save" value="<?php esc_attr_e('Save'); ?>" />
         </div>
         <br class="clear" />