WordPress.org

Make WordPress Core

Ticket #14050: 14050.002.diff

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

     
    250250                $tagnames = array_keys($shortcode_tags);
    251251                $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
    252252                $pee = preg_replace('/<p>\\s*?(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<\\/p>/s', '$1', $pee);
     253                $pee = preg_replace('/(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<br\\s*\\/>/s', '$1', $pee);
    253254        }
    254255
    255256        return $pee;