Ticket #21018: 21018.diff

File 21018.diff, 966 bytes (added by duck_, 11 months ago)
Line 
1Index: wp-includes/formatting.php
2===================================================================
3--- wp-includes/formatting.php  (revision 21089)
4+++ wp-includes/formatting.php  (working copy)
5@@ -236,8 +236,8 @@
6        foreach ( $pees as $tinkle )
7                $pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
8        $pee = preg_replace('|<p>\s*</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
9+       $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
10        $pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
11-       $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
12        $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee); // problem with nested lists
13        $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
14        $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);