Ticket #14050: 14050.001.diff

wp-includes/formatting.php

@@ -238 +238 @@
                 $tagnames = array_keys($shortcode_tags);
                 $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
                 $pee = preg_replace('/<p>\\s*?(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<\\/p>/s', '$1', $pee);
+                $pee = preg_replace('/(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<br\\s*\\/>/s', '$1', $pee);
         }
 
         return $pee;