summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsystem/core/CodeIgniter.php10
-rw-r--r--system/database/DB_driver.php7
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
*