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
This commit is contained in:
parent
0cfe1b9136
commit
021dcb13a1
|
@ -360,7 +360,11 @@ class WP_Widget_Text extends WP_Widget {
|
||||||
<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'] ); ?>"/>
|
<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>
|
</p>
|
||||||
<div class="notice inline notice-info notice-alt">
|
<div class="notice inline notice-info notice-alt">
|
||||||
<p><?php _e( 'This widget may contain code that may work better in the new “Custom HTML” 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 “Custom HTML” 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 “Custom HTML” widget. If you haven’t yet, how about trying that widget instead?' ); ?></p>
|
||||||
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
<label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label>
|
<label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label>
|
||||||
|
|
|
@ -457,7 +457,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase {
|
||||||
$widget->form( $instance );
|
$widget->form( $instance );
|
||||||
$form = ob_get_clean();
|
$form = ob_get_clean();
|
||||||
$this->assertContains( 'class="visual" type="hidden" value=""', $form );
|
$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(
|
$instance = array(
|
||||||
'title' => 'Title',
|
'title' => 'Title',
|
||||||
|
@ -468,7 +468,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase {
|
||||||
ob_start();
|
ob_start();
|
||||||
$widget->form( $instance );
|
$widget->form( $instance );
|
||||||
$form = ob_get_clean();
|
$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 );
|
$this->assertNotContains( 'class="visual" type="hidden" value=""', $form );
|
||||||
|
|
||||||
$instance = array(
|
$instance = array(
|
||||||
|
@ -480,7 +480,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase {
|
||||||
ob_start();
|
ob_start();
|
||||||
$widget->form( $instance );
|
$widget->form( $instance );
|
||||||
$form = ob_get_clean();
|
$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 );
|
$this->assertNotContains( 'class="visual" type="hidden" value=""', $form );
|
||||||
|
|
||||||
$instance = array(
|
$instance = array(
|
||||||
|
@ -493,7 +493,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase {
|
||||||
ob_start();
|
ob_start();
|
||||||
$widget->form( $instance );
|
$widget->form( $instance );
|
||||||
$form = ob_get_clean();
|
$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 );
|
$this->assertNotContains( 'class="visual" type="hidden" value=""', $form );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue