Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@12206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2009-11-18 08:12:05 +00:00
parent c131504b28
commit f4ae37b9f1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/shortcodes.php
View File

@ -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()