Merge upstream branch
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 482a6c8..73f3e44 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -63,10 +63,12 @@
public $queries = array();
public $query_times = array();
public $data_cache = array();
+
public $trans_enabled = TRUE;
public $trans_strict = TRUE;
protected $_trans_depth = 0;
protected $_trans_status = TRUE; // Used with transactions to determine if a rollback should occur
+
public $cache_on = FALSE;
public $cachedir = '';
public $cache_autodel = FALSE;
@@ -253,7 +255,7 @@
* Execute the query
*
* Accepts an SQL string as input and returns a result object upon
- * successful execution of a "read" type query. Returns boolean TRUE
+ * successful execution of a "read" type query. Returns boolean TRUE
* upon successful execution of a "write" type query. Returns boolean
* FALSE upon failure, and if the $db_debug variable is set to TRUE
* will raise an error.
@@ -1053,7 +1055,7 @@
/**
* Initialize the Cache Class
*
- * @return void
+ * @return bool
*/
protected function _cache_init()
{
@@ -1286,7 +1288,7 @@
return $item.$alias;
}
- // Is there a table prefix? If not, no need to insert it
+ // Is there a table prefix? If not, no need to insert it
if ($this->dbprefix != '')
{
// Verify table prefix and replace if necessary