commit 308eb0f8af8811bfc95c94036be53ed8974b64b0
author Andrey Andreev <narf@devilix.net> Tue Oct 03 14:17:55 2017 +0300
committer GitHub <noreply@github.com> Tue Oct 03 14:17:55 2017 +0300
tree 0015673281dd02aa73d78450933c229edf655de5
parent c495515f115685fbcb4180f4305ec2406144ca83
parent cf3924ec3f19fb6a3f4782cfe55e0c6314bcf94d

Merge pull request #5282 from pgee70/patch-1

Fix ORDER BY clauses being reset by count_all_results()

system/database/DB_query_builder.php

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 81603bf..72bd4e7 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1405,7 +1405,7 @@
 		// 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")