summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-10-09 00:38:31 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-10-09 00:38:31 +0200
commita8664295b31968aa29556b93b13bb6a6080be19e (patch)
tree404a63086198a559f804789e736b0c7a0c29d6e6 /system/database
parentd8ee6c86e4a3bbaf392679773e69f4791e3a3239 (diff)
moved call to $RES->num_rows() further down in code so that oracle-specific class variables would be set properly as needed before executing
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 257f1ee9b..572595f42 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -375,7 +375,6 @@ class CI_DB_driver {
$RES = new $driver();
$RES->conn_id = $this->conn_id;
$RES->result_id = $this->result_id;
- $RES->num_rows = $RES->num_rows();
if ($this->dbdriver == 'oci8')
{
@@ -385,6 +384,9 @@ class CI_DB_driver {
$this->stmt_id = FALSE;
}
+ // oci8 vars must be set before calling this
+ $RES->num_rows = $RES->num_rows();
+
// Is query caching enabled? If so, we'll serialize the
// result object and save it to a cache file.
if ($this->cache_on == TRUE AND $this->_cache_init())