WordPress.org

Make WordPress Core

Ticket #18807: 18807.samp-fix-3.patch

File 18807.samp-fix-3.patch, 2.9 KB (added by toscho, 15 months ago)

3rd attempt to fix samp

  • wp-admin/js/editor.js

     
    138138 
    139139        _wp_Autop : function(pee) { 
    140140                var preserve_linebreaks = false, preserve_br = false, 
    141                         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'; 
     141                        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'; 
    142142 
    143143                if ( pee.indexOf('<object') != -1 ) { 
    144144                        pee = pee.replace(/<object[\s\S]+?<\/object>/g, function(a){ 
  • wp-includes/formatting.php

     
    220220 
    221221        $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee); 
    222222        // Space things out a little 
    223         $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)'; 
     223        $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)'; 
    224224        $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee); 
    225225        $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee); 
    226226        $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines 
  • wp-includes/js/tinymce/wp-tinymce-schema.js

     
    441441                textBlockElementsMap = createLookupTable('text_block_elements', 'h1 h2 h3 h4 h5 h6 p div address pre form ' + 
    442442                                                'blockquote center dir fieldset header footer article section hgroup aside nav figure'); 
    443443                blockElementsMap = createLookupTable('block_elements', 'hr table tbody thead tfoot ' + 
    444                                                 'th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup', textBlockElementsMap); 
     444                                                'th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup', textBlockElementsMap); 
    445445 
    446446                // Converts a wildcard expression string to a regexp for example *a will become /.*a/. 
    447447                function patternToRegExp(str) {