summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysqli
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-23 14:14:33 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-23 14:14:33 +0200
commitae9475557c1968826aee0fa5554899c8329412c2 (patch)
treed457bcad3afa889602023b53a7e128a27e3ccf10 /system/database/drivers/mysqli
parent4b5616d5dc6ce118a472333b59f23e6eaf735144 (diff)
parentf46e726cfb726da2ec2095011ffe8625b6f9c816 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/database/drivers/mysqli')
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index e2684e4f2..9261883f5 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -523,16 +523,14 @@ class CI_DB_mysqli_driver extends CI_DB {
/**
* Close DB Connection
*
- * @param object
* @return void
*/
- protected function _close($conn_id)
+ protected function _close()
{
$this->conn_id->close();
- $this->conn_id = FALSE;
}
}
/* End of file mysqli_driver.php */
-/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */
+/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */ \ No newline at end of file