From 91bcefd4563dc6e1fe9a45bba23795fe57058548 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 23 Jul 2020 13:50:02 +0000 Subject: [PATCH] Docs: Add missing description for `wp_convert_widget_settings()` parameters. Props stevenlinx. Fixes #50738. Built from https://develop.svn.wordpress.org/trunk@48580 git-svn-id: http://core.svn.wordpress.org/trunk@48342 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-widget.php | 4 ++-- wp-includes/version.php | 2 +- wp-includes/widgets.php | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wp-includes/class-wp-widget.php b/wp-includes/class-wp-widget.php index eff0efda10..b2c4cbbc06 100644 --- a/wp-includes/class-wp-widget.php +++ b/wp-includes/class-wp-widget.php @@ -151,7 +151,7 @@ class WP_Widget { * * @since 2.8.0 * - * @param string $id_base Optional Base ID for the widget, lowercase and unique. If left empty, + * @param string $id_base Optional. Base ID for the widget, lowercase and unique. If left empty, * a portion of the widget's class name will be used. Has to be unique. * @param string $name Name for the widget displayed on the configuration page. * @param array $widget_options Optional. Widget options. See wp_register_sidebar_widget() for @@ -181,7 +181,7 @@ class WP_Widget { * * @see WP_Widget::__construct() * - * @param string $id_base Optional Base ID for the widget, lowercase and unique. If left empty, + * @param string $id_base Optional. Base ID for the widget, lowercase and unique. If left empty, * a portion of the widget's class name will be used. Has to be unique. * @param string $name Name for the widget displayed on the configuration page. * @param array $widget_options Optional. Widget options. See wp_register_sidebar_widget() for diff --git a/wp-includes/version.php b/wp-includes/version.php index 863aea916d..ff1104330b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta3-48579'; +$wp_version = '5.5-beta3-48580'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 939e45b07e..11d32268b5 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -1046,21 +1046,22 @@ function wp_get_widget_defaults() { } /** - * Convert the widget settings from single to multi-widget format. + * Converts the widget settings from single to multi-widget format. * * @since 2.8.0 * * @global array $_wp_sidebars_widgets * - * @param string $base_name - * @param string $option_name - * @param array $settings - * @return array + * @param string $base_name Root ID for all widgets of this type. + * @param string $option_name Option name for this widget type. + * @param array $settings The array of widget instance settings. + * @return array The array of widget settings converted to multi-widget format. */ function wp_convert_widget_settings( $base_name, $option_name, $settings ) { // This test may need expanding. $single = false; $changed = false; + if ( empty( $settings ) ) { $single = true; } else {