From 781f30bf49f41448fd91578e3329e70829a2ab35 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 12 Nov 2018 04:22:46 +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. Props dlh. See #45115. git-svn-id: https://develop.svn.wordpress.org/branches/5.0@43887 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/customize-nav-menus.js | 2 +- src/wp-includes/class-wp-customize-manager.php | 4 ++-- .../customize/class-wp-customize-new-menu-control.php | 2 +- .../customize/class-wp-customize-new-menu-section.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wp-admin/js/customize-nav-menus.js b/src/wp-admin/js/customize-nav-menus.js index dab5e89402..aee8dc559c 100644 --- a/src/wp-admin/js/customize-nav-menus.js +++ b/src/wp-admin/js/customize-nav-menus.js @@ -3111,7 +3111,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/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php index 1a5360d551..a4bc90f7f8 100644 --- a/src/wp-includes/class-wp-customize-manager.php +++ b/src/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/src/wp-includes/customize/class-wp-customize-new-menu-control.php b/src/wp-includes/customize/class-wp-customize-new-menu-control.php index 9925b59bff..ecd164c7cb 100644 --- a/src/wp-includes/customize/class-wp-customize-new-menu-control.php +++ b/src/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/src/wp-includes/customize/class-wp-customize-new-menu-section.php b/src/wp-includes/customize/class-wp-customize-new-menu-section.php index e0b9b0c5ad..28d9015c9f 100644 --- a/src/wp-includes/customize/class-wp-customize-new-menu-section.php +++ b/src/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 ); }