From efe8a967beccb9f05e0a21bb8f7669d237ae984b Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 24 Feb 2010 05:30:34 +0000
Subject: [PATCH] Don't quote escaped strings. Props dd32. see #11608

git-svn-id: http://svn.automattic.com/wordpress/trunk@13357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/wp-db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index b5031ef11..c4b278a0b 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -864,7 +864,7 @@ class wpdb {
 			$args = $args[0];
 		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
 		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
-		$query = str_replace( '%s', "'%s'", $query ); // quote the strings
+		$query = preg_replace('|(?<!%)%s|', "'%s'", $query); // quote the strings, avoiding escaped strings like %%s
 		array_walk( $args, array( &$this, 'escape_by_ref' ) );
 		return @vsprintf( $query, $args );
 	}