Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlsrv

2 files changed, 3 insertions, 6 deletions

diff --git a/system/database/drivers/sqlite3/sqlite3_driver.php b/system/database/drivers/sqlite3/sqlite3_driver.php
index 49cfbe7ec..d22f6a442 100644
--- a/system/database/drivers/sqlite3/sqlite3_driver.php
+++ b/system/database/drivers/sqlite3/sqlite3_driver.php
@@ -29,7 +29,7 @@
  * SQLite3 Database Adapter Class
  *
  * Note: _DB is an extender class that the app controller
- * creates dynamically based on whether the active record
+ * creates dynamically based on whether the query builder
  * class is being used or not.
  *
  * @package		CodeIgniter
@@ -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();
 	}
diff --git a/system/database/drivers/sqlite3/sqlite3_result.php b/system/database/drivers/sqlite3/sqlite3_result.php
index 64482e379..d83d6b2cd 100644
--- a/system/database/drivers/sqlite3/sqlite3_result.php
+++ b/system/database/drivers/sqlite3/sqlite3_result.php
@@ -198,8 +198,6 @@ class CI_DB_sqlite3_result extends CI_DB_result {
 			$this->row_data[$row_index++] = $row;
 		}
 
-		// Un-comment the following line, in case it becomes needed
-		// $this->_data_seek();
 		return $this->result_array = $this->row_data;
 	}
 
@@ -266,8 +264,6 @@ class CI_DB_sqlite3_result extends CI_DB_result {
 			$this->num_rows = count($this->result_object);
 		}
 
-		// Un-comment the following line, in case it becomes needed
-		// $this->_data_seek();
 		return $this->result_object;
 	}