Changeset 54419

Timestamp:

10/07/2022 08:46:39 PM (2 years ago)

Author:

westonruter

Message:

Customize: Prevent PHP notice in Customizer when using block theme.

Use the customize_panel_active filter to deactivate the Menus panel instead of overriding the check_capabilities method. This ensures the panel remains registered but is still hidden.

See #54888.
Fixes #54905.

Location:

trunk/src/wp-includes

Files:

• customize/class-wp-customize-nav-menus-panel.php (modified) (1 diff)
• theme.php (modified) (1 diff)

trunk/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php

@@ -99 +99 @@
         <?php
     }
-
-    /**
-     * Checks required user capabilities and whether the theme has the
-     * feature support required by the panel.
-     *
-     * @since 5.9.0
-     *
-     * @return bool False if theme doesn't support the panel or the user doesn't have the capability.
-     */
-    public function check_capabilities() {
-        /*
-         * WP_Customize_Panel::$theme_supports only supports checking one
-         * theme_supports, so instead we override check_capabilities().
-         */
-        if (
-            ! current_theme_supports( 'menus' ) &&
-            ! current_theme_supports( 'widgets' )
-        ) {
-            return false;
-        }
-
-        return parent::check_capabilities();
-    }
 }

trunk/src/wp-includes/theme.php

@@ -4258 +4258 @@
 
     add_filter( 'should_load_separate_core_block_assets', '__return_true' );
-}
+
+    /*
+     * Remove the Customizer's Menus panel when block theme is active.
+     */
+    add_filter(
+        'customize_panel_active',
+        static function ( $active, WP_Customize_Panel $panel ) {
+            if (
+                'nav_menus' === $panel->id &&
+                ! current_theme_supports( 'menus' ) &&
+                ! current_theme_supports( 'widgets' )
+            ) {
+                $active = false;
+            }
+            return $active;
+        },
+        10,
+        2
+    );
+}