Changeset 6102

Timestamp:

09/13/2007 04:11:21 AM (17 years ago)

Author:

ryan

Message:

Don't strip slashes from pre. Props DelGurth and mdawaffe. fixes #2059

File:

• trunk/wp-includes/formatting.php (modified) (2 diffs)

trunk/wp-includes/formatting.php

@@ -45 +45 @@
 }
 
-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;
 }
@@ -79 +87 @@
     $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 );