sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WPDB: Before fetching results, make sure we have a valid result resource to fetch them from.

Browse Source 
Fixes #27982.


git-svn-id: https://develop.svn.wordpress.org/trunk@30677 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2014-12-01 00:02:55 +00:00
parent 5817aa262d
commit 6eebbc5750
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/wp-db.php
View File

@ -1668,12 +1668,12 @@ class wpdb {
$return_val = $this->rows_affected; $return_val = $this->rows_affected;
} else { } else {
$num_rows = 0; $num_rows = 0;
if ( $this->use_mysqli ) { if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
while ( $row = @mysqli_fetch_object( $this->result ) ) { while ( $row = @mysqli_fetch_object( $this->result ) ) {
$this->last_result[$num_rows] = $row; $this->last_result[$num_rows] = $row;
$num_rows++; $num_rows++;
} }
} else { } else if ( is_resource( $this->result ) ) {
while ( $row = @mysql_fetch_object( $this->result ) ) { while ( $row = @mysql_fetch_object( $this->result ) ) {
$this->last_result[$num_rows] = $row; $this->last_result[$num_rows] = $row;
$num_rows++; $num_rows++;