From 46022a51de6be6fde82d0249ab90208a6799e00e Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Fri, 21 Jun 2013 18:22:26 +0000
Subject: [PATCH] Partially revert [24459] and only flush insert_id on the next
 insert or replace query, as we had been doing before. (Yes, this is not how
 mysql_insert_id() works.)

git-svn-id: https://develop.svn.wordpress.org/trunk@24494 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/wp-db.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 2c7472e8bb..b3f375326a 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -1117,7 +1117,7 @@ class wpdb {
 		$this->last_result = array();
 		$this->col_info    = null;
 		$this->last_query  = null;
-		$this->rows_affected = $this->num_rows = $this->insert_id = 0;
+		$this->rows_affected = $this->num_rows = 0;
 		$this->last_error  = '';
 
 		if ( is_resource( $this->result ) )
@@ -1299,6 +1299,7 @@ class wpdb {
 	function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
 		if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) )
 			return false;
+		$this->insert_id = 0;
 		$formats = $format = (array) $format;
 		$fields = array_keys( $data );
 		$formatted_fields = array();