Changeset 41117

Timestamp:

07/21/2017 09:16:58 PM (7 years ago)

Author:

westonruter

Message:

Widgets: Improve theme styling compatibility for Custom HTML widget by adding content container with textwidget class and widget_text class on widget wrapper element.

The same styling from the Text widget should apply to the Custom HTML widget since users are expected to copy HTML from the (legacy) Text widget into the latter.

Merges [41115] and partially [41116] onto 4.8 branch.
Amends [40893].
See #40907.
Fixes #41392 for 4.8.1.

Location:

branches/4.8

Files:

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

branches/4.8/src/wp-includes/default-widgets.php

@@ -134 +134 @@
         $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'];
         }
+        echo '<div class="textwidget custom-html-widget">'; // The textwidget class is for theme styling compatibility.
         echo $content;
+        echo '</div>';
         echo $args['after_widget'];
     }

branches/4.8/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( '<section id="custom_html-5" class="widget_text widget widget_custom_html">', $output );
+        $this->assertContains( '<div class="textwidget custom-html-widget">', $output );
         $this->assertNotContains( '<p>', $output );
         $this->assertNotContains( '<br>', $output );