Changeset 12206

Timestamp:

11/18/2009 08:12:05 AM (15 years ago)

Author:

markjaquith

Message:

Do not destroy characters surrounding shortcodes in strip_shortcodes(). fixes #10326

File:

• trunk/wp-includes/shortcodes.php (modified) (2 diffs)

trunk/wp-includes/shortcodes.php

@@ -176 +176 @@
     $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\])?(.?)';
 }
@@ -290 +291 @@
     $pattern = get_shortcode_regex();
 
-    return preg_replace('/'.$pattern.'/s', '', $content);
+    return preg_replace('/'.$pattern.'/s', '$1$6', $content);
 }