update documentation in database/query_builder.rst, change 2 tabs + 4 spaces to 3 tabs.
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index facaf0e..e5ffef2 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1353,7 +1353,7 @@
* returned by an Query Builder query.
*
* @param string
- * @param bool TRUE: resets QB values; FALSE: leave QB vaules alone
+ * @param bool the reset clause
* @return int
*/
public function count_all_results($table = '', $reset = TRUE)
@@ -1368,9 +1368,9 @@
? $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 === TRUE)
+ if ($reset === TRUE)
{
- $this->_reset_select();
+ $this->_reset_select();
}
if ($result->num_rows() === 0)
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6faa1d7..7f6cafa 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -176,7 +176,6 @@
- Added Interbase/Firebird database support via the *ibase* driver.
- Added ODBC support for ``create_database()``, ``drop_database()`` and ``drop_table()`` in :doc:`Database Forge <database/forge>`.
- Added support to binding arrays as ``IN()`` sets in ``query()``.
- - Added an optional second parameter to ``count_all_results()``.
- :doc:`Query Builder <database/query_builder>` changes include:
@@ -193,7 +192,7 @@
- Methods ``insert_batch()`` and ``update_batch()`` now return an integer representing the number of rows affected by them.
- Methods ``where()``, ``or_where()``, ``having()`` and ``or_having()`` now convert trailing ``=`` and ``<>``, ``!=`` SQL operators to ``IS NULL`` and ``IS NOT NULL`` respectively when the supplied comparison value is ``NULL``.
- Added method chaining support to ``reset_query()``, ``start_cache()``, ``stop_cache()`` and ``flush_cache()``.
- - Added an optional second parameter to ``count_all_results`` that allows leaving QB values alone.
+ - Added an optional second to ``count_all_results()`` to disable resetting of QB values.
- :doc:`Database Results <database/results>` changes include:
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 9b46947..68ddca7 100644
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -527,6 +527,12 @@
$this->db->from('my_table');
echo $this->db->count_all_results(); // Produces an integer, like 17
+The second paramater is to disable resetting of QB values. Example::
+
+ echo $this->db->count_all_results('my_table'); // Produces an integer, like 25
+ $this->db->like('title', 'match');
+ echo $this->db->count_all_results(); // Produces an integer, like 17
+
**$this->db->count_all()**
Permits you to determine the number of rows in a particular table.