summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGiuseppe Marcelli <giuseppem+bitbucket@gmail.com>2017-05-10 10:29:24 +0200
committerGiuseppe Marcelli <giuseppem+bitbucket@gmail.com>2017-05-10 10:29:24 +0200
commit0dbf6d3d501a5afcd1aa063c2eb0262df93c8fc6 (patch)
tree512f6ccb7b1e1a152c813b8af152da5d68b2b7c3 /system
parent8233b1d6fc56347195b3a0411806e197e2e59ad3 (diff)
Revert "Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymore to use the custom result object against cached database results, fixing this, for more info see issue 4665,1351"
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_result.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index ed1642bdc..98d8876a7 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -183,7 +183,7 @@ class CI_DB_result {
{
return $this->custom_result_object[$class_name];
}
- elseif ($this->result_id === FALSE OR $this->num_rows === 0)
+ elseif ( ! $this->result_id OR $this->num_rows === 0)
{
return array();
}