Changeset 41116

Timestamp:

07/21/2017 09:01:45 PM (8 years ago)

Author:

westonruter

Message:

Widgets: Include widget_text class name on Custom HTML widget wrapper for theme styling compatibility, in addition to previously-added textwidget class on nested content container.

Amends [40893], [41115].
See #40907.
Fixes #41392 for trunk.

Location:

trunk

Files:

• src/wp-includes/widgets/class-wp-widget-custom-html.php (modified) (1 diff)
• tests/phpunit/tests/widgets/custom-html-widget.php (modified) (2 diffs)

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

@@ -76 +76 @@
         $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 ) ) {

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

@@ -52 +52 @@
             '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",
         );
@@ -71 +71 @@
         $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 );