Ticket #45115: 45115.diff

src/wp-admin/js/customize-nav-menus.js

@@ -3111 +3111 @@
                 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
         });

src/wp-includes/class-wp-customize-manager.php

@@ -317 +317 @@
                 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 +325 @@
                 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' );

src/wp-includes/customize/class-wp-customize-new-menu-control.php

@@ -36 +36 @@
          * @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 );
         }
 

src/wp-includes/customize/class-wp-customize-new-menu-section.php

@@ -38 +38 @@
          * @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 );
         }