mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
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:
parent
c131504b28
commit
f4ae37b9f1
@ -175,6 +175,7 @@ function get_shortcode_regex() {
|
|||||||
$tagnames = array_keys($shortcode_tags);
|
$tagnames = array_keys($shortcode_tags);
|
||||||
$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
|
$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\])?(.?)';
|
return '(.?)\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -289,7 +290,7 @@ function strip_shortcodes( $content ) {
|
|||||||
|
|
||||||
$pattern = get_shortcode_regex();
|
$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()
|
add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
|
||||||
|
Loading…
Reference in New Issue
Block a user