WordPress.org

Make WordPress Core

Changeset 27527


Ignore:
Timestamp:
03/13/2014 09:50:17 PM (6 years ago)
Author:
johnbillion
Message:

figcaption should not be treated as a block-level element by wpautop(). See #25646. Props oso96_2000.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/js/editor.js

    r26876 r27527  
    206206            blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select' +
    207207                '|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section' +
    208                 '|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
     208                '|article|aside|hgroup|header|footer|nav|figure|details|menu|summary';
    209209
    210210        if ( pee.indexOf( '<object' ) !== -1 ) {
  • trunk/src/wp-includes/formatting.php

    r27424 r27527  
    235235    $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
    236236    // Space things out a little
    237     $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
     237    $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|details|menu|summary)';
    238238    $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
    239239    $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
Note: See TracChangeset for help on using the changeset viewer.