WordPress.org

Make WordPress Core

Ticket #14050: 14050.001.diff

File 14050.001.diff, 586 bytes (added by aaroncampbell, 5 years ago)
  • wp-includes/formatting.php

     
    238238                $tagnames = array_keys($shortcode_tags); 
    239239                $tagregexp = join( '|', array_map('preg_quote', $tagnames) ); 
    240240                $pee = preg_replace('/<p>\\s*?(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<\\/p>/s', '$1', $pee); 
     241                $pee = preg_replace('/(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<br\\s*\\/>/s', '$1', $pee); 
    241242        } 
    242243 
    243244        return $pee;