Changeset 8054

Timestamp:

06/05/08 20:11:38 (6 months ago)

Author:

ryan

Message:

Strip shortcodes when making excerpts. Props hailin. fixes #7100

Files:

• trunk/wp-includes/formatting.php (modified) (1 diff)
• trunk/wp-includes/shortcodes.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -840 +840 @@
-    if ( '' == $text ) {
-        $text = get_the_content('');
+        
+        $text = strip_shortcodes( $text ); 
+        
-        $text = apply_filters('the_content', $text);
-        $text = str_replace(']]>', ']]>', $text);

trunk/wp-includes/shortcodes.php

@@ -135 +135 @@
-}
-
+/* 
+ * 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() 
-