From be0b403077fd4563f7099047eaec7afa2bdaf848 Mon Sep 17 00:00:00 2001 From: desrosj Date: Mon, 17 Dec 2018 03:07:55 +0000 Subject: [PATCH] Docs: Future-proof comments referencing 5.0 TODOs. Some Customizer-related files contain inline comments referencing work to do for #42364 for 5.0. Those comments are now outdated as #42364 was moved to the 5.1 milestone. Merges [43887] to trunk. Props dlh, pento. Fixes #45115. Built from https://develop.svn.wordpress.org/trunk@44228 git-svn-id: http://core.svn.wordpress.org/trunk@44058 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/customize-nav-menus.js | 2 +- wp-includes/class-wp-customize-manager.php | 4 ++-- wp-includes/customize/class-wp-customize-new-menu-control.php | 2 +- wp-includes/customize/class-wp-customize-new-menu-section.php | 2 +- wp-includes/version.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-admin/js/customize-nav-menus.js b/wp-admin/js/customize-nav-menus.js index f51f6296d2..2addf27562 100644 --- a/wp-admin/js/customize-nav-menus.js +++ b/wp-admin/js/customize-nav-menus.js @@ -3114,7 +3114,7 @@ nav_menu_item: api.Menus.MenuItemControl, nav_menu: api.Menus.MenuControl, nav_menu_name: api.Menus.MenuNameControl, - new_menu: api.Menus.NewMenuControl, // @todo Remove in 5.0. See #42364. + new_menu: api.Menus.NewMenuControl, // @todo Remove in a future release. See #42364. nav_menu_locations: api.Menus.MenuLocationsControl, nav_menu_auto_add: api.Menus.MenuAutoAddControl }); diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index ed8c76df24..d2d89ff892 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -317,7 +317,7 @@ final class WP_Customize_Manager { require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' ); require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-locations-control.php' ); require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); // @todo Remove in 5.0. See #42364. + require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); // @todo Remove in a future release. See #42364. require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' ); @@ -325,7 +325,7 @@ final class WP_Customize_Manager { require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' ); require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' ); require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' ); // @todo Remove in 5.0. See #42364. + require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' ); // @todo Remove in a future release. See #42364. require_once( ABSPATH . WPINC . '/customize/class-wp-customize-custom-css-setting.php' ); require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' ); 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 9925b59bff..ecd164c7cb 100644 --- a/wp-includes/customize/class-wp-customize-new-menu-control.php +++ b/wp-includes/customize/class-wp-customize-new-menu-control.php @@ -36,7 +36,7 @@ class WP_Customize_New_Menu_Control extends WP_Customize_Control { * @param array $args Args. */ public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) { - _deprecated_file( basename( __FILE__ ), '4.9.0' ); // @todo Move this outside of class in 5.0, and remove its require_once() from class-wp-customize-control.php. See #42364. + _deprecated_file( basename( __FILE__ ), '4.9.0' ); // @todo Move this outside of class, and remove its require_once() from class-wp-customize-control.php. See #42364. parent::__construct( $manager, $id, $args ); } diff --git a/wp-includes/customize/class-wp-customize-new-menu-section.php b/wp-includes/customize/class-wp-customize-new-menu-section.php index e0b9b0c5ad..28d9015c9f 100644 --- a/wp-includes/customize/class-wp-customize-new-menu-section.php +++ b/wp-includes/customize/class-wp-customize-new-menu-section.php @@ -38,7 +38,7 @@ class WP_Customize_New_Menu_Section extends WP_Customize_Section { * @param array $args Section arguments. */ public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) { - _deprecated_file( basename( __FILE__ ), '4.9.0' ); // @todo Move this outside of class in 5.0, and remove its require_once() from class-wp-customize-section.php. See #42364. + _deprecated_file( basename( __FILE__ ), '4.9.0' ); // @todo Move this outside of class, and remove its require_once() from class-wp-customize-section.php. See #42364. parent::__construct( $manager, $id, $args ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 403e5a6ef3..216802b88f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44227'; +$wp_version = '5.1-alpha-44228'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.