From 4a00ea11279faf4a814af87309592427b4143ca0 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 4 Mar 2020 11:36:06 +0000 Subject: [PATCH] Docs: Reorder `@throws` tags in `WP_Customize_Nav_Menu_Setting` and `WP_Customize_Nav_Menu_Item_Setting` for consistency with `WP_Customize_Custom_CSS_Setting`. See #49572. Built from https://develop.svn.wordpress.org/trunk@47428 git-svn-id: http://core.svn.wordpress.org/trunk@47215 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../customize/class-wp-customize-nav-menu-item-setting.php | 4 ++-- wp-includes/customize/class-wp-customize-nav-menu-setting.php | 4 ++-- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php index 0be10e27c1..46601a9e18 100644 --- a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php +++ b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php @@ -155,12 +155,12 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting { * * @since 4.3.0 * + * @throws Exception If $id is not valid for this setting type. + * * @param WP_Customize_Manager $manager Customizer bootstrap instance. * @param string $id A specific ID of the setting. * Can be a theme mod or option name. * @param array $args Optional. Setting arguments. - * - * @throws Exception If $id is not valid for this setting type. */ public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) { if ( empty( $manager->nav_menus ) ) { diff --git a/wp-includes/customize/class-wp-customize-nav-menu-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-setting.php index 3ce4ab998b..c0783bf686 100644 --- a/wp-includes/customize/class-wp-customize-nav-menu-setting.php +++ b/wp-includes/customize/class-wp-customize-nav-menu-setting.php @@ -125,12 +125,12 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting { * * @since 4.3.0 * + * @throws Exception If $id is not valid for this setting type. + * * @param WP_Customize_Manager $manager Customizer bootstrap instance. * @param string $id A specific ID of the setting. * Can be a theme mod or option name. * @param array $args Optional. Setting arguments. - * - * @throws Exception If $id is not valid for this setting type. */ public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) { if ( empty( $manager->nav_menus ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 0af016956f..a32f5206b2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47427'; +$wp_version = '5.5-alpha-47428'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.