Ticket #41392: 41392.2.diff

src/wp-includes/widgets/class-wp-widget-custom-html.php

@@ -75 +75 @@
                  */
                 $content = apply_filters( 'widget_custom_html_content', $content, $instance, $this );
 
+                // Inject the Text widget's container class name alongside this widget's class name for theme styling compatibility.
+                $args['before_widget'] = preg_replace( '/(?<=\sclass=["\'])/', 'widget_text ', $args['before_widget'] );
+
                 echo $args['before_widget'];
                 if ( ! empty( $title ) ) {
                         echo $args['before_title'] . $title . $args['after_title'];

tests/phpunit/tests/widgets/custom-html-widget.php

@@ -51 +51 @@
                 $args = array(
                         'before_title'  => '<h2>',
                         'after_title'   => "</h2>\n",
-                        'before_widget' => '<section>',
+                        'before_widget' => '<section id="custom_html-5" class="widget widget_custom_html">',
                         'after_widget'  => "</section>\n",
                 );
                 $instance = array(
@@ -70 +70 @@
                 $this->assertNotEmpty( $this->widget_custom_html_content_args );
                 $this->assertNotEmpty( $this->widget_text_args );
                 $this->assertContains( '[filter:widget_text][filter:widget_custom_html_content]', $output );
-                $this->assertContains( '<div class="textwidget custom-html-widget">', $output );
+                $this->assertContains( '<section id="custom_html-5" class="widget_text widget widget_custom_html">', $output );
+                $this->assertContains( 'class="widget_text widget widget_custom_html"', $output );
                 $this->assertNotContains( '<p>', $output );
                 $this->assertNotContains( '<br>', $output );
                 $this->assertNotContains( '</u>', $output );