Changeset 36262

Timestamp:

01/11/2016 08:27:40 PM (9 years ago)

Author:

westonruter

Message:

Customizer: Re-use list of components to eliminate code duplication.

Introduces protected WP_Customize_Manager::$components to store list of loaded core components filtered by customize_loaded_components.

Props DrewAPicture.
See #35242
See #33552.
Fixes #35354.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (3 diffs)

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

@@ -93 +93 @@
      */
     protected $panels = array();
+
+    /**
+     * List of core components.
+     *
+     * @since 4.5.0
+     * @access protected
+     * @var array
+     */
+    protected $components = array( 'widgets', 'nav_menus' );
 
     /**
@@ -239 +248 @@
          * @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 ) ) {
@@ -1199 +1208 @@
      */
     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.' ),