Changeset 21888

Timestamp:

09/18/2012 05:32:44 PM (12 years ago)

Author:

nacin

Message:

Synchronize block-level elements between the JS and PHP versions of wpautop. props SergeyBiryukov. fixes #18534.

Location:

trunk

Files:

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

trunk/wp-admin/js/editor.js

@@ -141 +141 @@
     _wp_Autop : function(pee) {
         var preserve_linebreaks = false, preserve_br = false,
-            blocklist = 'table|thead|tfoot|tbody|tr|td|th|caption|col|colgroup|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]|fieldset|legend|hr|noscript|menu|samp|header|footer|article|section|hgroup|nav|aside|details|summary';
+            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|samp|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
 
         if ( pee.indexOf('<object') != -1 ) {

trunk/wp-includes/formatting.php

@@ -221 +221 @@
     $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|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|samp|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
     $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
     $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);