From 021dcb13a1690a49f78f5a38ea00ebc7dc54cad8 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Mon, 24 Jul 2017 23:10:06 +0000 Subject: [PATCH] Widgets: Improve notice in Text widget's legacy mode. Also fixes phpunit test which broke in [41132]. Props melchoyce, westonruter, gk.loveweb. See #41394, #35243, #40951, #40907. Fixes #41386. git-svn-id: https://develop.svn.wordpress.org/trunk@41134 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/widgets/class-wp-widget-text.php | 6 +++++- tests/phpunit/tests/widgets/text-widget.php | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/wp-includes/widgets/class-wp-widget-text.php b/src/wp-includes/widgets/class-wp-widget-text.php index 912c6181bb..2f43df3bea 100644 --- a/src/wp-includes/widgets/class-wp-widget-text.php +++ b/src/wp-includes/widgets/class-wp-widget-text.php @@ -360,7 +360,11 @@ class WP_Widget_Text extends WP_Widget {

-

+ +

+ +

+

diff --git a/tests/phpunit/tests/widgets/text-widget.php b/tests/phpunit/tests/widgets/text-widget.php index c65e2e0f5c..41aadb6af7 100644 --- a/tests/phpunit/tests/widgets/text-widget.php +++ b/tests/phpunit/tests/widgets/text-widget.php @@ -457,7 +457,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { $widget->form( $instance ); $form = ob_get_clean(); $this->assertContains( 'class="visual" type="hidden" value=""', $form ); - $this->assertNotContains( 'class="visual" type="hidden" value="1"', $form ); + $this->assertNotContains( 'class="visual" type="hidden" value="on"', $form ); $instance = array( 'title' => 'Title', @@ -468,7 +468,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { ob_start(); $widget->form( $instance ); $form = ob_get_clean(); - $this->assertContains( 'class="visual" type="hidden" value="1"', $form ); + $this->assertContains( 'class="visual" type="hidden" value="on"', $form ); $this->assertNotContains( 'class="visual" type="hidden" value=""', $form ); $instance = array( @@ -480,7 +480,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { ob_start(); $widget->form( $instance ); $form = ob_get_clean(); - $this->assertContains( 'class="visual" type="hidden" value="1"', $form ); + $this->assertContains( 'class="visual" type="hidden" value="on"', $form ); $this->assertNotContains( 'class="visual" type="hidden" value=""', $form ); $instance = array( @@ -493,7 +493,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { ob_start(); $widget->form( $instance ); $form = ob_get_clean(); - $this->assertContains( 'class="visual" type="hidden" value="1"', $form ); + $this->assertContains( 'class="visual" type="hidden" value="on"', $form ); $this->assertNotContains( 'class="visual" type="hidden" value=""', $form ); }