Ticket #19411: 19411.5.diff

wp-includes/default-filters.php

@@ -194 +194 @@
 add_filter( 'pings_open',               '_close_comments_for_old_post', 10, 2 );
 add_filter( 'editable_slug',            'urldecode'                           );
 add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'        );
-add_filter( 'widget_text',              'shortcode_unautop'                   );
-add_filter( 'widget_text',              'do_shortcode'                        );
 
 // Actions
 add_action( 'wp_head',             'wp_enqueue_scripts',              1     );

wp-includes/default-widgets.php

@@ -378 +378 @@
                 $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
                 $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance );
                 echo $before_widget;
-                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
-                        <div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?></div>
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
+                $text = !empty( $instance['filter'] ) ? wpautop( $text ) : $text;
+                if ( false === has_filter( 'widget_text', 'do_shortcode' ) )
+                        $text = do_shortcode( shortcode_unautop( $text ) );
+                ?>
+                        <div class="textwidget"><?php echo $text; ?></div>
                 <?php
                 echo $after_widget;
         }