| commit | 05097759476d3e18f2699503c1c47a30dba702af | [log] [tgz] |
|---|---|---|
| author | Derek Jones <derek.jones@ellislab.com> | Wed May 07 19:58:23 2008 +0000 |
| committer | Derek Jones <derek.jones@ellislab.com> | Wed May 07 19:58:23 2008 +0000 |
| tree | b1a109a7062f668aebf7faea5250b6442a8ab9af | |
| parent | cd6f9cdbbcdd550e73beccb906fe7ee78714a3f1 [diff] [blame] |
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/
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index 586c292..692d4f7 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php
@@ -114,7 +114,7 @@ */ 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;