Changeset 41135

Timestamp:

07/24/2017 11:14:50 PM (9 years ago)

Author:

westonruter

Message:

Widgets: Improve notice in Text widget's legacy mode.

Retains 'new' in notice on 4.8 branch, in contrast with [41134]. Also fixes phpunit test which broke in [41132].

Merges [41134] onto 4.8 branch.
Props melchoyce, westonruter.
See #41394, #35243, #40951, #40907.
Fixes #41386 for 4.8.1.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• src/wp-includes/widgets/class-wp-widget-text.php (modified) (1 diff)
• tests/phpunit/tests/widgets/text-widget.php (modified) (4 diffs)

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

@@ -361 +361 @@
                         </p>
                         <div class="notice inline notice-info notice-alt">
-                                <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>
+                                <?php if ( ! isset( $instance['visual'] ) ) : ?>
+                                        <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>
+                                <?php else : ?>
+                                        <p><?php _e( 'This widget may have contained code that may work better in the new &#8220;Custom HTML&#8221; widget. If you haven&#8217;t yet, how about trying that widget instead?' ); ?></p>
+                                <?php endif; ?>
                         </div>
                         <p>

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

@@ -458 +458 @@
                 $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(
@@ -469 +469 @@
                 $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 );
 
@@ -481 +481 @@
                 $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 );
 
@@ -494 +494 @@
                 $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 );
         }