Ticket #35354: 35354.diff

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

@@ -94 +94 @@
         protected $panels = array();
 
         /**
+         * List of core components.
+         *
+         * @since 4.5.0
+         * @access protected
+         * @var array
+         */
+        protected $components = array();
+
+        /**
          * Registered instances of WP_Customize_Section.
          *
          * @since 3.4.0
@@ -223 +232 @@
                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
 
+                // Core components.
+                $this->components = array( 'widgets', 'nav_menus' );
+
                 /**
                  * Filter the core Customizer components to load.
                  *
@@ -238 +250 @@
                  * @param array                $components List of core components to load.
                  * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
                  */
-                $components = apply_filters( 'customize_loaded_components', array( 'widgets', 'nav_menus' ), $this );
+                $components = apply_filters( 'customize_loaded_components', $this->components, $this );
 
                 if ( in_array( 'widgets', $components ) ) {
                         require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
@@ -1198 +1210 @@
          * @param string $id Panel ID to remove.
          */
         public function remove_panel( $id ) {
-                $core_panels = array(
-                        'widgets',
-                        'nav_menus',
-                );
-
-                if ( in_array( $id, $core_panels, true ) ) {
+                // Removing core components this way is _doing_it_wrong().
+                if ( in_array( $id, $this->components, true ) ) {
                         /* translators: 1: panel id, 2: filter reference URL, 3: filter name */
                         $message = sprintf( __( 'Removing %1$s manually will cause PHP warnings. Use the <a href="%2$s">%3$s</a> filter instead.' ),
                                 $id,