summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-08-23 18:46:11 +0200
committerTimothy Warren <tim@timshomepage.net>2011-08-23 18:46:11 +0200
commit6a450cf1b6440543b14379abacd6308fe51ea4f3 (patch)
tree4019334d3a59592aea9e90fd319028734e46b352 /system/database
parentab347586ef289e960ab7cfad32574e526cdcce0b (diff)
Fixed db->close() and db->free_result() functions
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/pdo/pdo_driver.php2
-rw-r--r--system/database/drivers/pdo/pdo_result.php3
2 files changed, 2 insertions, 3 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 3adc5f5ef..18617a457 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -632,7 +632,7 @@ class CI_DB_pdo_driver extends CI_DB {
*/
function _close($conn_id)
{
- @pdo_close($conn_id);
+ $this->conn_id = null;
}
diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php
index c38658626..5e136f581 100644
--- a/system/database/drivers/pdo/pdo_result.php
+++ b/system/database/drivers/pdo/pdo_result.php
@@ -111,9 +111,8 @@ class CI_DB_pdo_result extends CI_DB_result {
*/
function free_result()
{
- if (is_resource($this->result_id))
+ if (is_object($this->result_id))
{
- pdo_free_result($this->result_id);
$this->result_id = FALSE;
}
}