Changeset 23327

Timestamp:

01/22/2013 07:05:21 PM (12 years ago)

Author:

azaozz

Message:

Autop: <samp> is not a block tag, props toscho, fixes #18807

Location:

trunk

Files:

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

trunk/wp-admin/js/editor.js

@@ -139 +139 @@
     _wp_Autop : function(pee) {
         var preserve_linebreaks = false, preserve_br = false,
-            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';
+            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';
 
         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|noscript|samp|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|figcaption|details|menu|summary)';
     $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
     $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);

trunk/wp-includes/js/tinymce/wp-tinymce-schema.js

@@ -442 +442 @@
                         'blockquote center dir fieldset header footer article section hgroup aside nav figure');
         blockElementsMap = createLookupTable('block_elements', 'hr table tbody thead tfoot ' +
-                        'th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup', textBlockElementsMap);
+                        'th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup', textBlockElementsMap);
 
         // Converts a wildcard expression string to a regexp for example *a will become /.*a/.