diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-03-16 16:00:33 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-03-16 16:00:33 +0100 |
| commit | 00e34370e1f235b09e49adfa28f21c8fa3a41778 (patch) | |
| tree | 4680af17b7c7dfaa68bbf61586e3ee5a1dd7a454 /system/database/DB_query_builder.php | |
| parent | 7f310d63d61e9b334385ef5f6501129d685924ba (diff) | |
| parent | 2f164058e3ffa429747e27b284f67f2e71809f52 (diff) | |
Merge pull request #3669 from yaoshanliang/develop
count_all_results() with $this->reset_select()
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 79cbfb3ad..e5ffef2bb 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 the reset clause * @return int */ - public function count_all_results($table = '') + public function count_all_results($table = '', $reset = TRUE) { if ($table !== '') { @@ -1366,7 +1367,11 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $result = ($this->qb_distinct === TRUE) ? $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'))); - $this->_reset_select(); + + if ($reset === TRUE) + { + $this->_reset_select(); + } if ($result->num_rows() === 0) { |