Ticket #41394: 41394.0.diff

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

@@ -61 +61 @@
                 /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
                 $title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
 
+                // Prepare instance data that looks like a normal Text widget.
+                $simulated_text_widget_instance = $instance;
+                $simulated_text_widget_instance['text'] = $simulated_text_widget_instance['content'];
+                unset( $simulated_text_widget_instance['content'] );
+                $simulated_text_widget_instance['filter'] = false; // Because wpautop is not applied.
+
                 /** This filter is documented in wp-includes/widgets/class-wp-widget-text.php */
-                $content = apply_filters( 'widget_text', $instance['content'], $instance, $this );
+                $content = apply_filters( 'widget_text', $instance['content'], $simulated_text_widget_instance, $this );
 
                 /**
                  * Filters the content of the Custom HTML widget.

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

@@ -59 +59 @@
                         'content' => $content,
                 );
 
+                // Convert Custom HTML widget instance into Text widget instance data.
+                $text_widget_instance = array_merge( $instance, array(
+                        'filter' => false,
+                        'text' => $instance['content'],
+                ) );
+                unset( $text_widget_instance['content'] );
+
                 update_option( 'use_balanceTags', 0 );
                 add_filter( 'widget_custom_html_content', array( $this, 'filter_widget_custom_html_content' ), 5, 3 );
                 add_filter( 'widget_text', array( $this, 'filter_widget_text' ), 10, 3 );
@@ -73 +80 @@
                 $this->assertNotContains( '<p>', $output );
                 $this->assertNotContains( '<br>', $output );
                 $this->assertNotContains( '</u>', $output );
-                $this->assertEquals( $instance, $this->widget_text_args[1] );
+                $this->assertEquals( $text_widget_instance, $this->widget_text_args[1] );
                 $this->assertEquals( $instance, $this->widget_custom_html_content_args[1] );
                 $this->assertSame( $widget, $this->widget_text_args[2] );
                 $this->assertSame( $widget, $this->widget_custom_html_content_args[2] );
-                remove_filter( 'widget_custom_html_content', array( $this, 'filter_widget_custom_html_content' ), 5, 3 );
+                remove_filter( 'widget_custom_html_content', array( $this, 'filter_widget_custom_html_content' ), 5 );
                 remove_filter( 'widget_text', array( $this, 'filter_widget_text' ), 10 );
 
                 update_option( 'use_balanceTags', 1 );