![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Ticket #3935: 3935.wpautop-fix.patch
| File 3935.wpautop-fix.patch, 2.0 KB (added by , 19 years ago) |
|---|
-
wp-includes/formatting.php
56 56 $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee); 57 57 // Space things out a little 58 58 $allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|script|object|input|param|p|h[1-6])'; 59 $allblocksnop = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|script|object|input|param|h[1-6])'; 59 60 $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee); 60 61 $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee); 61 62 $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines … … 68 69 $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee); // problem with nested lists 69 70 $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee); 70 71 $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee); 71 $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee); 72 $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); 72 $pee = preg_replace('!<p>\s*(</?' . $allblocksnop . '[^>]*>)!', "$1", $pee); 73 $pee = preg_replace('!(</?' . $allblocksnop . '[^>]*>)\s*</p>!', "$1", $pee); 74 $pee = preg_replace('!(<p>\s*</p>(</?' . $allblocksnop . '[^>]*>))!', "$2", $pee); 73 75 if ($br) { 74 76 $pee = preg_replace('/<(script|style).*?<\/\\1>/se', 'str_replace("\n", "<WPPreserveNewline />", "\\0")', $pee); 75 77 $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks … … 80 82 if (strpos($pee, '<pre') !== false) 81 83 $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') . stripslashes(clean_pre('$2')) . '</pre>' ", $pee); 82 84 $pee = preg_replace( "|\n</p>$|", '</p>', $pee ); 83 84 85 return $pee; 85 86 } 86 87
