Changeset 1021

Timestamp:

03/29/2004 03:54:57 AM (22 years ago)

Author:

saxmatt

Message:

Fix for preg /e automatically adding slashes under some magic_quotes setting. BLAH.
Fix to not double escape values we're putting into the DB. This is an old, old bug from b2.

File:

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

trunk/wp-includes/functions-formatting.php

@@ -71 +71 @@
     $pee = preg_replace('!(</?(?:table|thead|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|p|h[1-6])[^>]*>)\s*<br />!', "$1", $pee);
     $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)!', '$1', $pee);
-    $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " '$1' .  clean_pre('$2')  . '</pre>' ", $pee);
+    $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  clean_pre('$2')  . '</pre>' ", $pee);
     $pee = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $pee);
     
@@ -225 +225 @@
     return $content;
 }
+
 function unautobrize($content) {
     $content = preg_replace("/<br>\n/", "\n", $content);   //for PHP versions before 4.0.5
@@ -233 +234 @@
 
 function format_to_edit($content) {
-    global $autobr;
     $content = stripslashes($content);
-    if ($autobr) { $content = unautobrize($content); }
     $content = htmlspecialchars($content);
     return $content;
 }
+
 function format_to_post($content) {
-    global $post_autobr,$comment_autobr;
-    $content = addslashes($content);
-    if ($post_autobr || $comment_autobr) { $content = autobrize($content); }
+    global $wpdb;
+    $content = stripslashes(stripslashes($content));
+    $content = $wpdb->escape($content);
     return $content;
 }