Eliminate error suppression for mysql_free_result() and only call it when the result is actually a resource. Depending on the query, mysql_query() can return a boolean rather than a resource, hence the original use of error suppression.
Fixes a warning introduced in [21472] when calling mysql_free_result() was moved to flush(). fixes #20838. git-svn-id: https://develop.svn.wordpress.org/trunk@21511 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
94be7cf95b
commit
69881dfee7
|
@ -130,6 +130,15 @@ class wpdb {
|
||||||
*/
|
*/
|
||||||
var $last_result;
|
var $last_result;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MySQL result, which is either a resource or boolean.
|
||||||
|
*
|
||||||
|
* @since unknown
|
||||||
|
* @access protected
|
||||||
|
* @var mixed
|
||||||
|
*/
|
||||||
|
protected $result;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Saved info on the table column
|
* Saved info on the table column
|
||||||
*
|
*
|
||||||
|
@ -1076,7 +1085,9 @@ class wpdb {
|
||||||
$this->last_result = array();
|
$this->last_result = array();
|
||||||
$this->col_info = null;
|
$this->col_info = null;
|
||||||
$this->last_query = null;
|
$this->last_query = null;
|
||||||
@mysql_free_result( $this->result );
|
|
||||||
|
if ( is_resource( $this->result ) )
|
||||||
|
mysql_free_result( $this->result );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue