Changeset 44228 for trunk

Timestamp:

12/16/2018 04:47:41 AM (6 years ago)

Author:

desrosj

Message:

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.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/js/_enqueues/wp/customize/nav-menus.js (modified) (1 diff)
• src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)
• src/wp-includes/customize/class-wp-customize-new-menu-control.php (modified) (1 diff)
• src/wp-includes/customize/class-wp-customize-new-menu-section.php (modified) (1 diff)

trunk/src/js/_enqueues/wp/customize/nav-menus.js

@@ -3115 +3115 @@
         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

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

@@ -318 +318 @@
         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' );
@@ -326 +326 @@
         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' );

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

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

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

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