diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:33 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:33 +0200 |
commit | ae9475557c1968826aee0fa5554899c8329412c2 (patch) | |
tree | d457bcad3afa889602023b53a7e128a27e3ccf10 /system/database/drivers/mysql/mysql_driver.php | |
parent | 4b5616d5dc6ce118a472333b59f23e6eaf735144 (diff) | |
parent | f46e726cfb726da2ec2095011ffe8625b6f9c816 (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/database/drivers/mysql/mysql_driver.php')
-rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 32c51865d..161f99541 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -520,15 +520,14 @@ class CI_DB_mysql_driver extends CI_DB { /** * Close DB Connection * - * @param resource * @return void */ - protected function _close($conn_id) + protected function _close() { - @mysql_close($conn_id); + @mysql_close($this->conn_id); } } /* End of file mysql_driver.php */ -/* Location: ./system/database/drivers/mysql/mysql_driver.php */ +/* Location: ./system/database/drivers/mysql/mysql_driver.php */
\ No newline at end of file |