Ticket #15367: 15367_formatting_wpautop.patch

formatting.php

@@ -178 +178 @@
         $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
         $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
         $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
+
+        // Pull out any PRE tags so they're not affected at all
+        $pres = array();
+        if ( strpos($pee, '<pre') !== false ){
+                preg_match_all( '!<pre[^>]*>.+?</pre>!is', $pee, $pres );
+                if ( count( $pres ) ){
+                        $pee = preg_replace( '!<pre[^>]*>.+?</pre>!is', '<WPPreservePre />', $pee );
+                }
+        }
+
         if ( strpos($pee, '<object') !== false ) {
                 $pee = preg_replace('|\s*<param([^>]*)>\s*|', "<param$1>", $pee); // no pee inside object/embed
                 $pee = preg_replace('|\s*</embed>\s*|', '</embed>', $pee);
@@ -203 +213 @@
         }
         $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
         $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-        if (strpos($pee, '<pre') !== false)
-                $pee = preg_replace_callback('!(<pre[^>]*>)(.*?)</pre>!is', 'clean_pre', $pee );
+        
+        // Substitute our preserved PREs back in
+        if ( count( $pres ) ){
+                foreach ( $pres as $pre ){
+                        $pee = preg_replace( '!<WPPreservePre />!', $pre[0], $pee, 1 );
+                }
+        }
+
+        // We don't need this any more. Better to leave all <pre> content untouched
+//      if (strpos($pee, '<pre') !== false)
+//              $pee = preg_replace_callback('!(<pre[^>]*>)(.*?)</pre>!is', 'clean_pre', $pee );
+        
         $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
         return $pee;