Ticket #12982: diff-sc.diff

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.')\b((?:[^\[\]]|(?R)|.)*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)';
 }
 
 /**
@@ -293 +293 @@
         return preg_replace('/'.$pattern.'/s', '$1$6', $content);
 }
 
-add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
+add_filter('the_content', 'do_shortcode', 9); 
 
 ?>
+ No newline at end of file