summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php12
-rw-r--r--system/database/DB_utility.php3
-rw-r--r--system/database/drivers/oci8/oci8_driver.php3
-rw-r--r--system/database/drivers/postgre/postgre_utility.php2
4 files changed, 13 insertions, 7 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index c8a00b7b1..99c95a6f2 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -682,7 +682,8 @@ class CI_DB_driver {
}
}
- return $this->data_cache['table_names'] =& $retval;
+ $this->data_cache['table_names'] = $retval;
+ return $this->data_cache['table_names'];
}
// --------------------------------------------------------------------
@@ -747,7 +748,8 @@ class CI_DB_driver {
}
}
- return $this->data_cache['field_names'][$table] =& $retval;
+ $this->data_cache['field_names'][$table] = $retval;
+ return $this->data_cache['field_names'][$table];
}
// --------------------------------------------------------------------
@@ -931,7 +933,8 @@ class CI_DB_driver {
*/
function cache_on()
{
- return $this->cache_on = TRUE;
+ $this->cache_on = TRUE;
+ return TRUE;
}
// --------------------------------------------------------------------
@@ -944,7 +947,8 @@ class CI_DB_driver {
*/
function cache_off()
{
- return $this->cache_on = FALSE;
+ $this->cache_on = FALSE;
+ return FALSE;
}
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index c2c5f1fe0..51e43a7c8 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -110,7 +110,8 @@ class CI_DB_utility {
}
}
- return $this->data_cache['db_names'] =& $dbs;
+ $this->data_cache['db_names'] = $dbs;
+ return $this->data_cache['db_names'];
}
// --------------------------------------------------------------------
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index e83c640bd..794405a03 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -163,7 +163,8 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function get_cursor()
{
- return $this->curs_id = ocinewcursor($this->conn_id);
+ $this->curs_id = ocinewcursor($this->conn_id);
+ return $this->curs_id;
}
// --------------------------------------------------------------------
diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php
index 0c265de16..b08b879d7 100644
--- a/system/database/drivers/postgre/postgre_utility.php
+++ b/system/database/drivers/postgre/postgre_utility.php
@@ -106,7 +106,7 @@ class CI_DB_postgre_utility extends CI_DB_utility {
*/
function _repair_table($table)
{
- return return FALSE;
+ return FALSE;
}
// --------------------------------------------------------------------