Ticket #40951: 40951.13.diff

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

@@ -95 +95 @@
                 }
 
                 $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.
                 if ( ! $wpautop && $has_line_breaks ) {
@@ -348 +348 @@
                                 <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>"/>
                         </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>
                                 <label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label>

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

@@ -266 +266 @@
                 $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when text is empty.' );
 
                 $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,
                 ) );