Changeset 28817

Timestamp:

06/24/2014 12:53:41 AM (10 years ago)

Author:

wonderboymusic

Message:

Remove noscript from wpautop()'s list of block elements.

Props mdawaffe.
Fixes #27268.

Location:

trunk/src

Files:

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

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

@@ -204 +204 @@
             preserve_br = false,
             blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre' +
-                '|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section' +
+                '|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section' +
                 '|article|aside|hgroup|header|footer|nav|figure|details|menu|summary';
 

trunk/src/wp-includes/formatting.php

@@ -157 +157 @@
         // Single quotes followed by spaces or ending punctuation.
         if ( "'" !== $closing_single_quote ) {
-            $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote; 
+            $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote;
         }
 
@@ -348 +348 @@
     $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|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)';
+    $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|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);