Ticket #10457: 10457.3.diff

wp-includes/default-widgets.php

@@ -374 +374 @@
         }
 
         function widget( $args, $instance ) {
-                extract($args);
+                if ( false !== $priority = has_filter( 'widget_text', 'do_shortcode' ) )
+                        remove_filter( 'widget_text', 'do_shortcode', $priority );
+                extract( $args );
                 $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 );
+                $text  = apply_filters( 'widget_text',  empty( $instance['text'] )  ? '' : $instance['text'],  $instance, $this->id_base );
                 echo $before_widget;
-                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
-                        <div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?></div>
-                <?php
+                
+                if ( ! empty( $title ) )
+                        echo $before_title . $title . $after_title;
+                echo '<div class="textwidget">';
+                        if ( ! empty( $instance['filter'] ) )
+                                $text = shortcode_unautop( wpautop( $text ) );
+                        echo do_shortcode( $text );
+                echo '</div>';
                 echo $after_widget;
         }