diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-10 13:03:21 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-10 13:03:21 +0200 |
| commit | ab77185242a8bb73c3e4eba1d962464aa51a9d1d (patch) | |
| tree | 82d6ad253002cba222ec1f0819d492b5aa65e83d | |
| parent | 697bf3ff1fe859968532d8dcc1e1cf7ecb55ca73 (diff) | |
| parent | 918be7963f6fa3461d612ea7ca4c9774c12f9da5 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-postgre
| -rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 3 | ||||
| -rw-r--r-- | system/database/drivers/sqlite3/sqlite3_driver.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 45f8cc1fb..60151b900 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -672,9 +672,10 @@ class CI_DB_pdo_driver extends CI_DB { /** * Close DB Connection * + * @param object * @return void */ - protected function _close() + protected function _close($conn_id) { $this->conn_id = NULL; } diff --git a/system/database/drivers/sqlite3/sqlite3_driver.php b/system/database/drivers/sqlite3/sqlite3_driver.php index 49cfbe7ec..fb45bee9c 100644 --- a/system/database/drivers/sqlite3/sqlite3_driver.php +++ b/system/database/drivers/sqlite3/sqlite3_driver.php @@ -417,9 +417,10 @@ class CI_DB_sqlite3_driver extends CI_DB { /** * Close DB Connection * + * @param object (ignored) * @return void */ - protected function _close() + protected function _close($conn_id) { $this->conn_id->close(); } |