From 19c2847a7c24daa0c2999b77ce82ae199afadda9 Mon Sep 17 00:00:00 2001
From: yaoshanliang <1329517386@qq.com>
Date: Sun, 15 Mar 2015 10:42:18 +0800
Subject: add changelog and documentation for adding an optional parameter to
 ``count_all_results()``

---
 system/database/DB_query_builder.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'system/database/DB_query_builder.php')

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 3d4a8576c..facaf0e4c 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1353,9 +1353,10 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 	 * returned by an Query Builder query.
 	 *
 	 * @param	string
+	 * @param	bool	TRUE: resets QB values; FALSE: leave QB vaules alone
 	 * @return	int
 	 */
-	public function count_all_results($table = '', $reset = true)
+	public function count_all_results($table = '', $reset = TRUE)
 	{
 		if ($table !== '')
 		{
@@ -1367,10 +1368,10 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 			? $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')));
 
-                if($reset)
-                {
-		        $this->_reset_select();
-                }
+		if($reset === TRUE)
+		{
+		    $this->_reset_select();
+		}
 
 		if ($result->num_rows() === 0)
 		{
-- 
cgit v1.2.3-24-g4f1b