diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-10-16 10:11:00 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-10-16 10:11:00 +0200 |
| commit | 7907f98a963c0cb8625ecbb4d8a178c6d769339a (patch) | |
| tree | 0ae85eb89a0d774d36eaf0ddba9509cdced973d8 /system/database/DB_query_builder.php | |
| parent | 61dfda5953f99813f8309a4fa843c255b6631224 (diff) | |
| parent | d282d07dfba94b5395d1dd989bdb958c972bb7cf (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index e7b66ac80..baa5ba814 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1477,7 +1477,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // for selecting COUNT(*) ... $qb_orderby = $this->qb_orderby; $qb_cache_orderby = $this->qb_cache_orderby; - $this->qb_orderby = $this->qb_cache_orderby = NULL; + $this->qb_orderby = $this->qb_cache_orderby = array(); $result = ($this->qb_distinct === TRUE OR ! empty($this->qb_groupby) OR ! empty($this->qb_cache_groupby) OR $this->qb_limit OR $this->qb_offset) ? $this->query($this->_count_string.$this->protect_identifiers('numrows')."\nFROM (\n".$this->_compile_select()."\n) CI_count_all_results") |