Ticket #3833: 3833.3.diff
File 3833.3.diff, 2.1 KB (added by , 16 years ago) |
---|
-
wp-includes/formatting.php
120 120 $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee); 121 121 // Space things out a little 122 122 $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|input|p|h[1-6]|hr)'; 123 $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee); 124 $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee); 123 $textblocks = '(caption|td|th|div|dd|dt|li|pre|blockquote|address|p|h[1-6])'; 125 124 $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines 125 $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n\n$1\n\n", $pee); 126 $pee = preg_replace('!(</' . $allblocks . '>)!', "\n\n$1\n\n", $pee); 126 127 if ( strpos($pee, '<object') !== false ) { 127 128 $pee = preg_replace('|\s*<param([^>]*)>\s*|', "<param$1>", $pee); // no pee inside object/embed 128 129 $pee = preg_replace('|\s*</embed>\s*|', '</embed>', $pee); 129 130 } 130 $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates131 131 // make paragraphs, including one at the end 132 $pees = preg_split('/\n \s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY);132 $pees = preg_split('/\n(?:\s*\n)+/', $pee, -1, PREG_SPLIT_NO_EMPTY); 133 133 $pee = ''; 134 134 foreach ( $pees as $tinkle ) 135 135 $pee .= '<p>' . trim($tinkle, "\n") . "</p>\n"; … … 141 141 $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee); 142 142 $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee); 143 143 $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); 144 // turn <li><p>foo</p></li> into <li>foo</li> 145 $pee = preg_replace('!<' . $textblocks . '([^>]*)>\n<p>([^\n]*)</p>\n</\\1>!', "<$1$2>$3</$1>", $pee); 144 146 if ($br) { 145 147 $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', create_function('$matches', 'return str_replace("\n", "<WPPreserveNewline />", $matches[0]);'), $pee); 146 148 $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks