Ticket #6380: 6380.diff

wp-includes/formatting.php

@@ -829 +829 @@
-function wp_trim_excerpt($text) { // Fakes an excerpt if needed
-        if ( '' == $text ) {
-                $text = get_the_content('');
+                $shortcodes = has_filter('the_content', 'do_shortcode');
+                if( $shortcodes )
+                        remove_filter('the_content', 'do_shortcode');
-                $text = apply_filters('the_content', $text);
+                if( $shortcodes )
+                        add_filter('the_content', 'do_shortcode');
-                $text = str_replace(']]>', ']]>', $text);
-                $text = strip_tags($text);
-                $excerpt_length = 55;
@@ -839 +844 @@
-                        array_push($words, '[...]');
-                        $text = implode(' ', $words);
-                }
+                if( $shortcodes )
+                        $text = do_shortcode($text);
-        }
-        return $text;
-}