diff options
author | Derek Jones <derek.jones@ellislab.com> | 2008-05-07 21:58:23 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2008-05-07 21:58:23 +0200 |
commit | 05097759476d3e18f2699503c1c47a30dba702af (patch) | |
tree | b1a109a7062f668aebf7faea5250b6442a8ab9af /system/database/drivers/mysqli | |
parent | cd6f9cdbbcdd550e73beccb906fe7ee78714a3f1 (diff) |
Added checks for objects in DB driver instead of just resources to accommodate MySQLi, and fixed check in mysqli_result.php checking for a resource.
http://codeigniter.com/bug_tracker/bug/3461/
Diffstat (limited to 'system/database/drivers/mysqli')
-rw-r--r-- | system/database/drivers/mysqli/mysqli_result.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index 586c29252..692d4f729 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -114,7 +114,7 @@ class CI_DB_mysqli_result extends CI_DB_result { */
function free_result()
{
- if (is_resource($this->result_id))
+ if (is_object($this->result_id))
{
mysqli_free_result($this->result_id);
$this->result_id = FALSE;
|