Changeset 30297 for trunk/src/wp-includes/wp-db.php

Timestamp:

11/10/2014 05:39:50 AM (11 years ago)

Author:

pento

Message:

wpdb::flush() was not flushing results correctly when using mysqli.

This change also allows stored procedures or queries made with mysqli_multi_query() to be flushed.

Includes unit tests.

Fixes #28155.

Props soulseekah.

File:

• trunk/src/wp-includes/wp-db.php (modified) (1 diff)

trunk/src/wp-includes/wp-db.php

@@ -1323 +1323 @@
         $this->last_error  = '';
 
-        if ( is_resource( $this->result ) ) {
-            if ( $this->use_mysqli ) {
-                mysqli_free_result( $this->result );
-            } else {
-                mysql_free_result( $this->result );
-            }
+        if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
+            mysqli_free_result( $this->result );
+            $this->result = null;
+
+            // Clear out any results from a multi-query
+            while ( mysqli_more_results( $this->dbh ) ) {
+                mysqli_next_result( $this->dbh );
+            }
+        } else if ( is_resource( $this->result ) ) {
+            mysql_free_result( $this->result );
         }
     }