Changeset 24495

Timestamp:

06/21/2013 06:23:56 PM (11 years ago)

Author:

nacin

Message:

Partially revert [24460] and only flush insert_id on the next insert or replace query, as we had been doing before.

Merges [24494] to the 3.5 branch.

File:

• branches/3.5/wp-includes/wp-db.php (modified) (2 diffs)

branches/3.5/wp-includes/wp-db.php

@@ -1121 +1121 @@
         $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  = '';
 
@@ -1303 +1303 @@
         if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) )
             return false;
+        $this->insert_id = 0;
         $formats = $format = (array) $format;
         $fields = array_keys( $data );