Changeset 41070

Timestamp:

07/18/2017 04:16:16 AM (7 years ago)

Author:

westonruter

Message:

Widgets: Discount shortcodes and leading/trailing line breaks for triggering Text widget legacy mode.

Since plugin-added shortcode handling is just-in-time deferred to run after wpautop, there is no need to retain the presence of shortcodes to trigger legacy mode. Also updates Text widget legacy mode notice informing of Custom HTML widget.

Amends [41050].
Props westonruter, melchoyce.
Fixes #40951 for trunk.

Location:

trunk

Files:

• src/wp-includes/widgets/class-wp-widget-text.php (modified) (3 diffs)
• tests/phpunit/tests/widgets/text-widget.php (modified) (2 diffs)

trunk/src/wp-includes/widgets/class-wp-widget-text.php

@@ -96 +96 @@
 
         $wpautop = ! empty( $instance['filter'] );
-        $has_line_breaks = ( false !== strpos( $instance['text'], "\n" ) );
+        $has_line_breaks = ( false !== strpos( trim( $instance['text'] ), "\n" ) );
 
         // If auto-paragraphs are not enabled and there are line breaks, then ensure legacy mode.
@@ -105 +105 @@
         // If an HTML comment is present, assume legacy mode.
         if ( false !== strpos( $instance['text'], '<!--' ) ) {
-            return true;
-        }
-
-        /*
-         * If a shortcode is present (with support added by a plugin), assume legacy mode
-         * since shortcodes would apply at the widget_text filter and thus be applied
-         * before wpautop runs at the widget_text_content filter.
-         */
-        if ( preg_match( '/' . get_shortcode_regex() . '/', $instance['text'] ) ) {
             return true;
         }
@@ -349 +340 @@
             </p>
             <div class="notice inline notice-info notice-alt">
-                <p><?php _e( 'This widget contains code that may work better in the new &#8220;Custom HTML&#8221; widget. How about trying that widget instead?' ); ?></p>
+                <p><?php _e( 'This widget may contain code that may work better in the new &#8220;Custom HTML&#8221; widget. How about trying that widget instead?' ); ?></p>
             </div>
             <p>

trunk/tests/phpunit/tests/widgets/text-widget.php

@@ -267 +267 @@
 
         $instance = array_merge( $base_instance, array(
+            'text' => "\nOne line",
+            'filter' => false,
+        ) );
+        $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when there is leading whitespace.' );
+
+        $instance = array_merge( $base_instance, array(
+            'text' => "\nOne line\n\n",
+            'filter' => false,
+        ) );
+        $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when there is trailing whitespace.' );
+
+        $instance = array_merge( $base_instance, array(
             'text' => "One\nTwo",
             'filter' => false,
@@ -295 +307 @@
         ) );
         $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy when HTML comment is present.' );
-
-        $instance = array_merge( $base_instance, array(
-            'text' => 'Here is a [gallery]',
-            'filter' => true,
-        ) );
-        $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy mode when a shortcode is present.' );
 
         // Check text examples that will not migrate to TinyMCE.