Changeset 27527

Timestamp:

03/13/2014 09:50:17 PM (11 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:

• wp-admin/js/editor.js (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)

trunk/src/wp-admin/js/editor.js

@@ -206 +206 @@
             blocklist = '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';
+                '|article|aside|hgroup|header|footer|nav|figure|details|menu|summary';
 
         if ( pee.indexOf( '<object' ) !== -1 ) {

trunk/src/wp-includes/formatting.php

@@ -235 +235 @@
     $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
     // Space things out a little
-    $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)';
+    $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)';
     $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
     $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);