Ticket #7100: 7100_strip_shortcodes.diff

C:/xampp/htdocs/wordpress_trunk/wp-includes/shortcodes.php

@@ -134 +134 @@
         return $out;
 }
 
+/* 
+ * stip all the shortcodes from a post's content 
+ * returns the content without shortcodes
+ */
+function strip_shortcodes( $content ) { 
+        
+        global $shortcode_tags;
+
+        if (empty($shortcode_tags) || !is_array($shortcode_tags))
+                return $content;
+
+        $pattern = get_shortcode_regex();
+
+        return preg_replace('/'.$pattern.'/s', '', $content);
+        
+}
+
 add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop() 
 
 ?>

C:/xampp/htdocs/wordpress_trunk/wp-includes/formatting.php

@@ -839 +839 @@
 function wp_trim_excerpt($text) { // Fakes an excerpt if needed
         if ( '' == $text ) {
                 $text = get_the_content('');
+                
+                $text = strip_shortcodes( $text ); 
+                
                 $text = apply_filters('the_content', $text);
                 $text = str_replace(']]>', ']]>', $text);
                 $text = strip_tags($text);