Ticket #40772: 40772.1.diff

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

@@ -67 +67 @@
                 /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
                 $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
-                $widget_text = ! empty( $instance['text'] ) ? $instance['text'] : '';
+                $text = ! empty( $instance['text'] ) ? $instance['text'] : '';
 
                 /**
                  * Filters the content of the Text widget.
@@ -75 +75 @@
                  * @since 2.3.0
                  * @since 4.4.0 Added the `$this` parameter.
                  *
-                 * @param string         $widget_text The widget content.
-                 * @param array          $instance    Array of settings for the current widget.
-                 * @param WP_Widget_Text $this        Current Text widget instance.
+                 * @param string         $text     The widget content.
+                 * @param array          $instance Array of settings for the current widget.
+                 * @param WP_Widget_Text $this     Current Text widget instance.
                  */
-                $text = apply_filters( 'widget_text', $widget_text, $instance, $this );
+                $text = apply_filters( 'widget_text', $text, $instance, $this );
 
                 if ( isset( $instance['filter'] ) ) {
                         if ( 'content' === $instance['filter'] ) {
@@ -91 +91 @@
                                  *
                                  * @since 4.8.0
                                  *
-                                 * @param string         $widget_text The widget content.
-                                 * @param array          $instance    Array of settings for the current widget.
-                                 * @param WP_Widget_Text $this        Current Text widget instance.
+                                 * @param string         $text     The widget content.
+                                 * @param array          $instance Array of settings for the current widget.
+                                 * @param WP_Widget_Text $this     Current Text widget instance.
                                  */
-                                $text = apply_filters( 'widget_text_content', $widget_text, $instance, $this );
+                                $text = apply_filters( 'widget_text_content', $text, $instance, $this );
 
                         } elseif ( $instance['filter'] ) {
                                 $text = wpautop( $text ); // Back-compat for instances prior to 4.8.

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

@@ -74 +74 @@
                         'filter' => false,
                 );
 
-                add_filter( 'widget_text_content', array( $this, 'filter_widget_text_content' ), 10, 3 );
-                add_filter( 'widget_text', array( $this, 'filter_widget_text' ), 10, 3 );
+                add_filter( 'widget_text_content', array( $this, 'filter_widget_text_content' ), 5, 3 );
+                add_filter( 'widget_text', array( $this, 'filter_widget_text' ), 5, 3 );
 
                 // Test with filter=false.
                 ob_start();
@@ -85 +85 @@
                 $this->assertNotContains( '<br />', $output );
                 $this->assertEmpty( $this->widget_text_content_args );
                 $this->assertNotEmpty( $this->widget_text_args );
+                $this->assertContains( '[filter:widget_text]', $output );
+                $this->assertNotContains( '[filter:widget_text_content]', $output );
 
                 // Test with filter=true.
                 $instance['filter'] = true;
@@ -98 +100 @@
                 $this->assertEquals( $instance, $this->widget_text_args[1] );
                 $this->assertEquals( $widget, $this->widget_text_args[2] );
                 $this->assertEmpty( $this->widget_text_content_args );
+                $this->assertContains( '[filter:widget_text]', $output );
+                $this->assertNotContains( '[filter:widget_text_content]', $output );
 
                 // Test with filter=content, the upgraded widget.
                 $instance['filter'] = 'content';
@@ -111 +115 @@
                 $this->assertEquals( $instance, $this->widget_text_args[1] );
                 $this->assertEquals( $widget, $this->widget_text_args[2] );
                 $this->assertCount( 3, $this->widget_text_content_args );
-                $this->assertEquals( wpautop( $instance['text'] ), $this->widget_text_content_args[0] );
+                $this->assertEquals( $instance['text'] . '[filter:widget_text]', $this->widget_text_content_args[0] );
                 $this->assertEquals( $instance, $this->widget_text_content_args[1] );
                 $this->assertEquals( $widget, $this->widget_text_content_args[2] );
+                $this->assertContains( wpautop( $instance['text'] . '[filter:widget_text][filter:widget_text_content]' ), $output );
         }
 
         /**
@@ -127 +132 @@
         function filter_widget_text( $widget_text, $instance, $widget ) {
                 $this->widget_text_args = func_get_args();
 
+                $widget_text .= '[filter:widget_text]';
                 return $widget_text;
         }
 
@@ -141 +147 @@
         function filter_widget_text_content( $widget_text, $instance, $widget ) {
                 $this->widget_text_content_args = func_get_args();
 
+                $widget_text .= '[filter:widget_text_content]';
                 return $widget_text;
         }