site_iri: comparison web/wp-admin/includes/widgets.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 * @package WordPress
 * @subpackage Administration
 */
 /**
-* Display list of the available widgets, either all or matching search.
+* Display list of the available widgets.
 *
-* The search parameter are search terms separated by spaces.
+* @since 2.5.0
-*
-* @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() {
 	global $wp_registered_widgets, $sidebars_widgets, $wp_registered_widget_controls;
 	$sort = $wp_registered_widgets;
-	usort( $sort, create_function( '$a, $b', 'return strnatcasecmp( $a["name"], $b["name"] );' ) );
+	usort( $sort, '_sort_name_callback' );
 	$done = array();
 	foreach ( $sort as $widget ) {
 		if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
 			continue;
 		call_user_func_array( 'wp_widget_control', $args );
 	}
 }
 /**
+* 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 unknown
+* @since 2.5.0
 *
 * @param string $sidebar id slug of the sidebar
 */
 function wp_list_widget_controls( $sidebar ) {
 	add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
 	$description = wp_sidebar_description( $sidebar );
 	if ( !empty( $description ) ) {
 		echo "<div class='sidebar-description'>\n";
 		echo "\t<p class='description'>$description</p>";
 		echo "</div>\n";
 	}
 	dynamic_sidebar( $sidebar );
 	echo "</div>\n";
 }
 /**
 * {@internal Missing Short Description}}
 *
-* @since unknown
+* @since 2.5.0
 *
 * @param array $params
 * @return array
 */
 function wp_list_widget_controls_dynamic_sidebar( $params ) {
 	$widget_id = $params[0]['widget_id'];
 	$id = isset($params[0]['_temp_id']) ? $params[0]['_temp_id'] : $widget_id;
 	$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
 	$params[0]['after_title'] = "%END_OF_TITLE%"; // deprecated
 	if ( is_callable( $wp_registered_widgets[$widget_id]['callback'] ) ) {
 		$wp_registered_widgets[$widget_id]['_callback'] = $wp_registered_widgets[$widget_id]['callback'];
 /**
 * Meta widget used to display the control form for a widget.
 *
 * Called from dynamic_sidebar().
 *
-* @since unknown
+* @since 2.5.0
 *
 * @param array $sidebar_args
 * @return array
 */
 function wp_widget_control( $sidebar_args ) {
 	} else {
 		$query_arg['sidebar'] = $sidebar_id;
 		$query_arg['key'] = $key;
 	}
-	// We aren't showing a widget control, we're outputing a template for a mult-widget control
+	// We aren't showing a widget control, we're outputting a template for a multi-widget control
 	if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
 		// number == -1 implies a template where id numbers are replaced by a generic '__i__'
 		$control['params'][0]['number'] = -1;
 		// with id_base widget id's are constructed like {$id_base}-{$id_number}
 		if ( isset($control['id_base']) )
 		<div class="alignleft">
 		<a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> |
 		<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
 		</div>
 		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
-		<img src="images/wpspin_light.gif" class="ajax-feedback " title="" alt="" />
+		<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" />
-		<input type="submit" name="savewidget" class="button-primary widget-control-save" value="<?php esc_attr_e('Save'); ?>" />
+		<?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
 		</div>
 		<br class="clear" />
 	</div>
 	</form>
 	</div>
 	</div>
 <?php
 	echo $sidebar_args['after_widget'];
 	return $sidebar_args;
 }

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b