diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/widgets.php --- a/wp/wp-admin/includes/widgets.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/includes/widgets.php Mon Oct 14 17:39:30 2019 +0200 @@ -10,6 +10,9 @@ * Display list of the available widgets. * * @since 2.5.0 + * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls */ function wp_list_widgets() { global $wp_registered_widgets, $wp_registered_widget_controls; @@ -51,6 +54,8 @@ * * @since 3.1.0 * @access private + * + * @return int */ function _sort_name_callback( $a, $b ) { return strnatcasecmp( $a['name'], $b['name'] ); @@ -62,8 +67,8 @@ * * @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' ); @@ -75,30 +80,37 @@ if ( $sidebar_name ) { ?>
'; - if ( ! empty( $description ) ) { - echo '' . $description . '
'; + ?> + + '; - dynamic_sidebar( $sidebar ); echo ''; } /** - * {@internal Missing Short Description}} + * Retrieves the widget control arguments. * * @since 2.5.0 * + * @global array $wp_registered_widgets + * + * @staticvar int $i + * * @param array $params * @return array */ @@ -123,7 +135,14 @@ return $params; } -function next_widget_id_number($id_base) { +/** + * + * @global array $wp_registered_widgets + * + * @param string $id_base + * @return int + */ +function next_widget_id_number( $id_base ) { global $wp_registered_widgets; $number = 1; @@ -143,6 +162,10 @@ * * @since 2.5.0 * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls + * @global array $sidebars_widgets + * * @param array $sidebar_args * @return array */ @@ -161,6 +184,11 @@ $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; @@ -194,25 +222,30 @@ echo $sidebar_args['before_widget']; ?>