summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-01-15 15:26:23 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-01-15 15:26:23 +0100
commit6e848ed2afa39b5c99fda7bc061c864bd619269f (patch)
treeb9d3311f49d1ac1c77d5ca7abc490d1344ff41fe /system
parentf2931e33aca42f7e35e5bee4f4e3219ebe769a29 (diff)
Fixed a bug in the Oracle driver that prevented num_rows from working.
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_driver.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index fc700ec32..a7f03e3e5 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -329,7 +329,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')
{
@@ -337,7 +336,9 @@ class CI_DB_driver {
$RES->curs_id = NULL;
$RES->limit_used = $this->limit_used;
}
-
+
+ $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())