Ticket #17657: 17657.diff

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\])?(.?)';
+        return '(.?)\[('.$tagregexp.')(?=[^\w-])(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)';
 }
 
 /**