summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-06 19:37:31 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-06 19:37:31 +0100
commit9aa97db15a930bac9beefd3fe23224ef59c6a8e9 (patch)
tree19642f4694ecc19a0ba284162e9fac62818f4b37
parent5d93e13326b86344610cf13008726e40bef0a5b8 (diff)
parent4c20260e72a4f2aae21417121a864b34bab51496 (diff)
Merge upstream branch
-rw-r--r--system/database/DB_driver.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 482a6c8f3..73f3e44d7 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -63,10 +63,12 @@ class CI_DB_driver {
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 @@ class CI_DB_driver {
* 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 @@ class CI_DB_driver {
/**
* Initialize the Cache Class
*
- * @return void
+ * @return bool
*/
protected function _cache_init()
{
@@ -1286,7 +1288,7 @@ class CI_DB_driver {
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