WordPress.org

Make WordPress Core

Ticket #45115: 45115.diff

File 45115.diff, 4.2 KB (added by dlh, 16 months ago)
  • src/wp-admin/js/customize-nav-menus.js

    diff --git src/wp-admin/js/customize-nav-menus.js src/wp-admin/js/customize-nav-menus.js
    index dab5e89402..aee8dc559c 100644
     
    31113111                nav_menu_item: api.Menus.MenuItemControl,
    31123112                nav_menu: api.Menus.MenuControl,
    31133113                nav_menu_name: api.Menus.MenuNameControl,
    3114                 new_menu: api.Menus.NewMenuControl, // @todo Remove in 5.0. See #42364.
     3114                new_menu: api.Menus.NewMenuControl, // @todo Remove in a future release. See #42364.
    31153115                nav_menu_locations: api.Menus.MenuLocationsControl,
    31163116                nav_menu_auto_add: api.Menus.MenuAutoAddControl
    31173117        });
  • src/wp-includes/class-wp-customize-manager.php

    diff --git src/wp-includes/class-wp-customize-manager.php src/wp-includes/class-wp-customize-manager.php
    index 1a5360d551..a4bc90f7f8 100644
    final class WP_Customize_Manager { 
    317317                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
    318318                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-locations-control.php' );
    319319                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
    320                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); // @todo Remove in 5.0. See #42364.
     320                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); // @todo Remove in a future release. See #42364.
    321321
    322322                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
    323323
    final class WP_Customize_Manager { 
    325325                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
    326326                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
    327327                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
    328                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' ); // @todo Remove in 5.0. See #42364.
     328                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' ); // @todo Remove in a future release. See #42364.
    329329
    330330                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-custom-css-setting.php' );
    331331                require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
  • src/wp-includes/customize/class-wp-customize-new-menu-control.php

    diff --git src/wp-includes/customize/class-wp-customize-new-menu-control.php src/wp-includes/customize/class-wp-customize-new-menu-control.php
    index 9925b59bff..ecd164c7cb 100644
    class WP_Customize_New_Menu_Control extends WP_Customize_Control { 
    3636         * @param array                $args    Args.
    3737         */
    3838        public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
    39                 _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.
     39                _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.
    4040                parent::__construct( $manager, $id, $args );
    4141        }
    4242
  • src/wp-includes/customize/class-wp-customize-new-menu-section.php

    diff --git src/wp-includes/customize/class-wp-customize-new-menu-section.php src/wp-includes/customize/class-wp-customize-new-menu-section.php
    index e0b9b0c5ad..28d9015c9f 100644
    class WP_Customize_New_Menu_Section extends WP_Customize_Section { 
    3838         * @param array                $args    Section arguments.
    3939         */
    4040        public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
    41                 _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.
     41                _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.
    4242                parent::__construct( $manager, $id, $args );
    4343        }
    4444