Revert "Ignore LIMIT when using CI_DB_query_builder::count_all_results"

This reverts commit 9f6da3c2f11535fee09dd306ae6b884168e4623b.

Signed-off-by: tianhe1986 <w1s2j3229@163.com>

1 files changed, 3 insertions, 21 deletions

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 2e1003395..ef375227c 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1488,15 +1488,6 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			$this->qb_orderby = NULL;
 		}
 
-		//ignore LIMIT
-		if ($this->qb_limit OR $this->qb_offset)
-		{
-			$limit = $this->qb_limit;
-			$this->qb_limit = NULL;
-			$offset = $this->qb_offset;
-			$this->qb_offset = NULL;
-		}
-
 		$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')));
@@ -1505,19 +1496,10 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		{
 			$this->_reset_select();
 		}
-		// If we've previously reset the qb_orderby,qb_limit or qb_offset values, get them back
-		else
+		// If we've previously reset the qb_orderby values, get them back
+		elseif ( ! isset($this->qb_orderby))
 		{
-			if ( ! isset($this->qb_orderby))
-			{
-				$this->qb_orderby = $orderby;
-			}
-
-			if ( ! isset($this->qb_limit))
-			{
-				$this->qb_limit = $limit;
-				$this->qb_offset = $offset;
-			}
+			$this->qb_orderby = $orderby;
 		}
 
 		if ($result->num_rows() === 0)