diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php index da6333183b..c97b24d071 100644 --- a/wp-includes/class-wp-customize-control.php +++ b/wp-includes/class-wp-customize-control.php @@ -184,6 +184,8 @@ class WP_Customize_Control { * be used. * @type string $setting The primary setting for the control (if there is one). * Default 'default'. + * @type string $capability Capability required to use this control. Normally this is empty + * and the capability is derived from `$settings`. * @type int $priority Order priority to load the control. Default 10. * @type string $section Section the control belongs to. Default empty. * @type string $label Label for the control. Default empty. @@ -195,11 +197,14 @@ class WP_Customize_Control { * attribute names are the keys and values are the values. Not * used for 'checkbox', 'radio', 'select', 'textarea', or * 'dropdown-pages' control types. Default empty array. + * @type bool $allow_addition Show UI for adding new content, currently only used for the + * dropdown-pages control. Default false. * @type array $json Deprecated. Use WP_Customize_Control::json() instead. * @type string $type Control type. Core controls include 'text', 'checkbox', * 'textarea', 'radio', 'select', and 'dropdown-pages'. Additional * input types such as 'email', 'url', 'number', 'hidden', and * 'date' are supported implicitly. Default 'text'. + * @type callback $active_callback Active callback. * } */ public function __construct( $manager, $id, $args = array() ) { diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 8f4c9c55d7..daee794100 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -3993,26 +3993,9 @@ final class WP_Customize_Manager { * @since 4.5.0 Return added WP_Customize_Control instance. * * @param WP_Customize_Control|string $id Customize Control object, or ID. - * @param array $args { - * Optional. Array of properties for the new Control object. Default empty array. - * - * @type array $settings All settings tied to the control. If undefined, defaults to `$setting`. - * IDs in the array correspond to the ID of a registered `WP_Customize_Setting`. - * @type string $setting The primary setting for the control (if there is one). Default is 'default'. - * @type string $capability Capability required to use this control. Normally derived from `$settings`. - * @type int $priority Order priority to load the control. Default 10. - * @type string $section The section this control belongs to. Default empty. - * @type string $label Label for the control. Default empty. - * @type string $description Description for the control. Default empty. - * @type array $choices List of choices for 'radio' or 'select' type controls, where values - * are the keys, and labels are the values. Default empty array. - * @type array $input_attrs List of custom input attributes for control output, where attribute - * names are the keys and values are the values. Default empty array. - * @type bool $allow_addition Show UI for adding new content, currently only used for the - * dropdown-pages control. Default false. - * @type string $type The type of the control. Default 'text'. - * @type callback $active_callback Active callback. - * } + * @param array $args Optional. Array of properties for the new Control object. + * See WP_Customize_Control::__construct() for information + * on accepted arguments. Default empty array. * @return WP_Customize_Control The instance of the control that was added. */ public function add_control( $id, $args = array() ) { diff --git a/wp-includes/customize/class-wp-customize-color-control.php b/wp-includes/customize/class-wp-customize-color-control.php index f1ebcf7e19..cd19aea283 100644 --- a/wp-includes/customize/class-wp-customize-color-control.php +++ b/wp-includes/customize/class-wp-customize-color-control.php @@ -47,7 +47,7 @@ class WP_Customize_Color_Control extends WP_Customize_Control { * @param string $id Control ID. * @param array $args Optional. Arguments to override class property defaults. * See WP_Customize_Control::__construct() for information - * on accepted arguments. + * on accepted arguments. Default empty array. */ public function __construct( $manager, $id, $args = array() ) { $this->statuses = array( '' => __( 'Default' ) ); diff --git a/wp-includes/customize/class-wp-customize-media-control.php b/wp-includes/customize/class-wp-customize-media-control.php index ef2079bf28..ac441c04ec 100644 --- a/wp-includes/customize/class-wp-customize-media-control.php +++ b/wp-includes/customize/class-wp-customize-media-control.php @@ -49,7 +49,7 @@ class WP_Customize_Media_Control extends WP_Customize_Control { * @param string $id Control ID. * @param array $args Optional. Arguments to override class property defaults. * See WP_Customize_Control::__construct() for information - * on accepted arguments. + * on accepted arguments. Default empty array. */ public function __construct( $manager, $id, $args = array() ) { parent::__construct( $manager, $id, $args ); diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php index 7f39e11b2d..b842cab15d 100644 --- a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php +++ b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php @@ -43,7 +43,7 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control { * @param string $id The control ID. * @param array $args Optional. Arguments to override class property defaults. * See WP_Customize_Control::__construct() for information - * on accepted arguments. + * on accepted arguments. Default empty array. */ public function __construct( $manager, $id, $args = array() ) { parent::__construct( $manager, $id, $args ); diff --git a/wp-includes/customize/class-wp-customize-new-menu-control.php b/wp-includes/customize/class-wp-customize-new-menu-control.php index 69d27dcc4a..8d4d3fe6c5 100644 --- a/wp-includes/customize/class-wp-customize-new-menu-control.php +++ b/wp-includes/customize/class-wp-customize-new-menu-control.php @@ -38,7 +38,7 @@ class WP_Customize_New_Menu_Control extends WP_Customize_Control { * @param string $id The control ID. * @param array $args Optional. Arguments to override class property defaults. * See WP_Customize_Control::__construct() for information - * on accepted arguments. + * on accepted arguments. Default empty array. */ public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) { _deprecated_function( __METHOD__, '4.9.0' ); diff --git a/wp-includes/customize/class-wp-customize-site-icon-control.php b/wp-includes/customize/class-wp-customize-site-icon-control.php index 1126bdbb70..37825716ed 100644 --- a/wp-includes/customize/class-wp-customize-site-icon-control.php +++ b/wp-includes/customize/class-wp-customize-site-icon-control.php @@ -35,7 +35,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control * @param string $id Control ID. * @param array $args Optional. Arguments to override class property defaults. * See WP_Customize_Control::__construct() for information - * on accepted arguments. + * on accepted arguments. Default empty array. */ public function __construct( $manager, $id, $args = array() ) { parent::__construct( $manager, $id, $args ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 8d9a139c5b..79820af822 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-beta2-47363'; +$wp_version = '5.4-beta2-47364'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.