diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-12-14 15:42:29 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-12-14 15:42:29 +0100 |
| commit | 788fb4aa823179e7c4401f5384207d916697bb7e (patch) | |
| tree | 551fd91834cc4f259d44d2355638552130ca2749 /system/database/DB_query_builder.php | |
| parent | 97ecf2fcce8e3133e286e16de1b49612235a8dcf (diff) | |
| parent | bc05b84995d5425d6bdc28c43174e70b720840ce (diff) | |
Merge branch '3.0-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 cf1100d27..7a3d2f594 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1379,7 +1379,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $this->from($table); } - $result = ($this->qb_distinct === TRUE) + $result = ($this->qb_distinct === TRUE OR ! empty($this->qb_orderby)) ? $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'))); |