X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..refs/tags/wordpress-4.4:/wp-admin/includes/widgets.php?ds=inline diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index 36cf6449..746a8927 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -67,8 +67,8 @@ function _sort_name_callback( $a, $b ) { * * @since 2.5.0 * - * @param string $sidebar id slug of the sidebar - * @param string optional $sidebar_name Include the HTML for the sidebar name + * @param string $sidebar Sidebar ID. + * @param string $sidebar_name Optional. Sidebar name. Default empty. */ function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) { add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' ); @@ -81,26 +81,26 @@ function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) { ?>
'; - if ( ! empty( $description ) ) { - echo '' . $description . '
'; + ?> + + '; - dynamic_sidebar( $sidebar ); echo ''; } /** - * {@internal Missing Short Description}} + * Retrieves the widget control arguments. * * @since 2.5.0 * @@ -181,6 +181,11 @@ function wp_widget_control( $sidebar_args ) { $multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : ''; $add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : ''; + $before_form = isset( $sidebar_args['before_form'] ) ? $sidebar_args['before_form'] : ''; + $before_widget_content = isset( $sidebar_args['before_widget_content'] ) ? $sidebar_args['before_widget_content'] : ' '; + $query_arg = array( 'editwidget' => $widget['id'] ); if ( $add_new ) { $query_arg['addnew'] = 1; @@ -221,18 +226,20 @@ function wp_widget_control( $sidebar_args ) { - +