From 12f588566fa5cd301a53071c3f403ec61b3887d3 Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Wed, 18 Nov 2009 08:12:05 +0000 Subject: [PATCH] Do not destroy characters surrounding shortcodes in strip_shortcodes(). fixes #10326 git-svn-id: https://develop.svn.wordpress.org/trunk@12206 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/shortcodes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php index 6ced181603..bad91c14ba 100644 --- 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()