summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAlex Fang <deeno@qq.com>2016-12-23 03:38:11 +0100
committerAlex Fang <deeno@qq.com>2016-12-23 03:38:11 +0100
commit8112b5341ec02d38e448e767ab95196df9a84a74 (patch)
tree945f5d4805729da7712df5578a317d95a36f4178 /system/database
parenta927ae4ee86fb6727ac340e7b96aee6f82b5542b (diff)
1. Updated last comit with comment for https://github.com/bcit-ci/CodeIgniter/pull/4955
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_query_builder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 6d165fc79..48c857125 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1402,7 +1402,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
$this->qb_orderby = NULL;
}
- $result = ($this->qb_distinct === TRUE OR ! empty($this->qb_groupby) OR in_array('groupby', $this->qb_cache_exists))
+ $result = ($this->qb_distinct === TRUE OR ! empty($this->qb_groupby) OR ! empty($this->qb_cache_groupby))
? $this->query($this->_count_string.$this->protect_identifiers('numrows')."\nFROM (\n".$this->_compile_select()."\n) CI_count_all_results")
: $this->query($this->_compile_select($this->_count_string.$this->protect_identifiers('numrows')));