diff options
| author | Root <development@fractureme.com> | 2012-05-22 00:30:00 +0200 |
|---|---|---|
| committer | Root <development@fractureme.com> | 2012-05-22 00:30:00 +0200 |
| commit | 36237d8305260282b46f52f9fec91b5b7176088f (patch) | |
| tree | 52076e8820579ce4a67c119996dde9097703d910 /system | |
| parent | 1d79efea47d26e0e567f919c648adf5b554f3ff0 (diff) | |
Move closing of database connection to CI_DB_driver->__destruct - #1376
Diffstat (limited to 'system')
| -rwxr-xr-x | system/core/CodeIgniter.php | 10 | ||||
| -rw-r--r-- | system/database/DB_driver.php | 7 |
2 files changed, 7 insertions, 10 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 00db6e13a..585bb7b31 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -393,15 +393,5 @@ */ $EXT->call_hook('post_system'); -/* - * ------------------------------------------------------ - * Close the DB connection if one exists - * ------------------------------------------------------ - */ - if (class_exists('CI_DB') && isset($CI->db) && ! $CI->db->pconnect) - { - $CI->db->close(); - } - /* End of file CodeIgniter.php */ /* Location: ./system/core/CodeIgniter.php */
\ No newline at end of file diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index ef77b594e..c757277ce 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -92,6 +92,13 @@ abstract class CI_DB_driver { // -------------------------------------------------------------------- + public function __destruct() + { + $this->close(); + } + + // -------------------------------------------------------------------- + /** * Initialize Database Settings * |