Wordpress 2.9.2-scripts

[autoinstalls/wordpress.git] / wp-includes / shortcodes.php

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 6ced181603cf703ff655cca1b6f656010dd2780a..bad91c14ba56654032a917ef61eb4882685b759d 100644 (file)
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -175,6 +175,7 @@ function get_shortcode_regex() {
        $tagnames = array_keys($shortcode_tags);
        $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
 
+       // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcodes()
        return '(.?)\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)';
 }
 
@@ -289,7 +290,7 @@ function strip_shortcodes( $content ) {
 
        $pattern = get_shortcode_regex();
 
-       return preg_replace('/'.$pattern.'/s', '', $content);
+       return preg_replace('/'.$pattern.'/s', '$1$6', $content);
 }
 
 add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()