Changeset 60279

Timestamp:

06/05/2025 08:43:08 AM (5 months ago)

Author:

audrasjb

Message:

Customize: Prevent errors occuring with Classic Theme without Widgets.

This changeset prevents the customizer from displaying a warning when a classic theme has no widget area.

Props ArtZ91, SirLouen, audrasjb, dilipbheda.
Fixes #63151.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-widgets.php (modified) (1 diff)
• tests/phpunit/tests/customize/widgets.php (modified) (1 diff)

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

@@ -922 +922 @@
                 <h3>
                     <span class="customize-action">
-                    <?php
+                        <?php
+                        $panel       = $this->manager->get_panel( 'widgets' );
+                        $panel_title = $panel && isset( $panel->title ) ? $panel->title : __( 'Widgets' );
                         /* translators: &#9656; is the unicode right-pointing triangle. %s: Section title in the Customizer. */
-                        printf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'widgets' )->title ) );
-                    ?>
+                        printf( __( 'Customizing &#9656; %s' ), esc_html( $panel_title ) );
+                        ?>
                     </span>
                     <?php _e( 'Add a Widget' ); ?>

trunk/tests/phpunit/tests/customize/widgets.php

@@ -873 +873 @@
         $this->manager->widgets->remove_prepreview_filters();
     }
+
+    /**
+     * Test that output_widget_control_templates() works without sidebars.
+     * This test verifies that the fix for accessing panel title works correctly
+     * when no sidebars are registered or the widgets panel doesn't exist.
+     *
+     * @ticket 63151
+     *
+     * @covers WP_Customize_Widgets::output_widget_control_templates
+     */
+    public function test_output_widget_control_templates_without_sidebars() {
+        global $wp_registered_sidebars;
+
+        $original_sidebars      = $wp_registered_sidebars;
+        $wp_registered_sidebars = array();
+        $manager                = new WP_Customize_Manager();
+        $widgets                = new WP_Customize_Widgets( $manager );
+
+        if ( $manager->get_panel( 'widgets' ) ) {
+            $manager->remove_panel( 'widgets' );
+        }
+
+        ob_start();
+
+        $widgets->output_widget_control_templates();
+
+        $output                 = ob_get_clean();
+        $wp_registered_sidebars = $original_sidebars;
+
+        $this->assertStringNotContainsString( 'Warning', $output, 'Failed asserting that the output does not contain "Warning".' );
+        $this->assertStringNotContainsString( 'Notice', $output, 'Failed asserting that the output does not contain "Notice".' );
+        $this->assertStringNotContainsString( 'Error', $output, 'Failed asserting that the output does not contain "Error".' );
+
+        // Check that the output contains expected widget controls HTML.
+        $this->assertStringContainsString( 'id="widgets-left"', $output, 'Failed asserting that the output contains "id=widgets-left".' );
+        $this->assertStringContainsString( 'id="available-widgets"', $output, 'Failed asserting that the output contains "id=available-widgets".' );
+        $this->assertStringNotContainsString( 'id="accordion-panel-widgets"', $output, 'Failed asserting that the output does not contain "id=accordion-panel-widgets".' );
+    }
 }