X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..85ad385665744d9cc3bcd939906309be7268edb3:/wp-admin/includes/widgets.php diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index 6b7d6351..c574f41f 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -58,27 +58,40 @@ function _sort_name_callback( $a, $b ) { /** * Show the widgets and their settings for a sidebar. - * Used in the the admin widget config screen. + * Used in the admin widget config screen. * * @since 2.5.0 * * @param string $sidebar id slug of the sidebar + * @param string optional $sidebar_name Include the HTML for the sidebar name */ -function wp_list_widget_controls( $sidebar ) { +function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) { add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' ); - echo "
\n"; + + echo ''; } /** @@ -160,7 +173,7 @@ function wp_widget_control( $sidebar_args ) { $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; @@ -179,7 +192,11 @@ function wp_widget_control( $sidebar_args ) { @@ -207,8 +224,8 @@ function wp_widget_control( $sidebar_args ) {