Ticket #9264: shortcodes.diff

wp-includes/shortcodes.php

@@ -175 +175 @@
         $tagnames = array_keys($shortcode_tags);
         $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
 
-        return '(.?)\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)';
+        return '(.?)\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?(4)|(?:(.+?)\[\/\2\]))?(.?)';
 }
 
 /**
@@ -294 +294 @@
 
 add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
 
-?>
- No newline at end of file
+?>