Ticket #3669: ptag-formatting.patch

formatting.php

@@ -64 +64 @@
         $pee = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
         $pee = preg_replace('|<p>\s*?</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
         $pee = preg_replace( '|<p>(<div[^>]*>\s*)|', "$1<p>", $pee );
+        $pee = preg_replace( '|(</div[^>]*>\s*)</p>|', "</p>$1", $pee );
         $pee = preg_replace('!<p>([^<]+)\s*?(</(?:div|address|form)[^>]*>)!', "<p>$1</p>$2", $pee);
         $pee = preg_replace( '|<p>|', "$1<p>", $pee );
         $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag