diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:10 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-23 14:14:10 +0200 |
| commit | 2fceb85c49142cd512c10080a3cd9ad067f0414c (patch) | |
| tree | 861162f9c4b8137d73045e6b71533946fbcfc108 /system/database/drivers/mysql | |
| parent | 249204b67d9d437898198ad355d452f467f70dc3 (diff) | |
| parent | f46e726cfb726da2ec2095011ffe8625b6f9c816 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errors
Diffstat (limited to 'system/database/drivers/mysql')
| -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 |