Ticket #2059: 2059.diff

wp-includes/formatting.php

@@ -44 +44 @@
         return $output;
 }
 
-function clean_pre($text) {
+// Accepts matches array from preg_replace_callback in wpautop()
+// or a string
+function clean_pre($matches) {
+        if ( is_array($matches) )
+                $text = $matches[1] . $matches[2] . "</pre>";
+        else
+                $text = $matches;
+
         $text = str_replace('<br />', '', $text);
         $text = str_replace('<p>', "\n", $text);
         $text = str_replace('</p>', '', $text);
+
         return $text;
 }
 
@@ -78 +86 @@
         $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('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' ", $pee);
+                $pee = preg_replace_callback('!(<pre.*?>)(.*?)</pre>!is', 'clean_pre', $pee );
         $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
         return $pee;