summaryrefslogtreecommitdiffstats
path: root/system/database/DB_active_rec.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-10 21:04:29 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-10 21:04:29 +0100
commit189a34ec0949c6e96c896b92a8b1ea09ae9f232c (patch)
treeddb25a94de1095598e1b88bc2d082552cef392e5 /system/database/DB_active_rec.php
parent3c7c461a93145b045ba688585a5b606e28b7d7cb (diff)
parentb790371f328e49ed57eda85bf33817e033b85601 (diff)
Merge upstream branch
Diffstat (limited to 'system/database/DB_active_rec.php')
-rw-r--r--system/database/DB_active_rec.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 71762a4de..424735157 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1127,15 +1127,14 @@ class CI_DB_active_record extends CI_DB_driver {
$result = $this->query($this->_compile_select($this->_count_string.$this->_protect_identifiers('numrows')));
$this->_reset_select();
- if ($query->num_rows() === 0)
+ if ($result->num_rows() === 0)
{
return 0;
}
- $row = $query->row();
+ $row = $result->row();
return (int) $row->numrows;
}
-
// --------------------------------------------------------------------
/**