WP Merge with revision 8075

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 17 insertions, 0 deletions

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 907f7ff..490f7a6 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -134,6 +134,23 @@ function shortcode_atts($pairs, $atts) {
 	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() 
 
 ?>