Ticket #19411: 19411.diff
File 19411.diff, 1.9 KB (added by , 13 years ago) |
---|
-
wp-includes/default-filters.php
194 194 add_filter( 'pings_open', '_close_comments_for_old_post', 10, 2 ); 195 195 add_filter( 'editable_slug', 'urldecode' ); 196 196 add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object' ); 197 add_filter( 'widget_text', 'wpautop' ); // dependent on the widget setting 197 198 add_filter( 'widget_text', 'shortcode_unautop' ); 198 199 add_filter( 'widget_text', 'do_shortcode' ); 199 200 -
wp-includes/default-widgets.php
374 374 } 375 375 376 376 function widget( $args, $instance ) { 377 extract( $args);377 extract( $args ); 378 378 $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); 379 if ( empty( $instance['filter'] ) ) { 380 remove_filter( 'widget_text', 'wpautop' ); 381 remove_filter( 'widget_text', 'shortcode_unautop' ); 382 } 379 383 $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance ); 384 if ( empty( $instance['filter'] ) ) { 385 add_filter( 'widget_text', 'wpautop' ); 386 add_filter( 'widget_text', 'shortcode_unautop' ); 387 } 380 388 echo $before_widget; 381 if ( ! empty( $title ) ) { echo $before_title . $title . $after_title; } ?>382 <div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) :$text; ?></div>389 if ( ! empty( $title ) ) { echo $before_title . $title . $after_title; } ?> 390 <div class="textwidget"><?php echo $text; ?></div> 383 391 <?php 384 392 echo $after_widget; 385 393 }