| commit | 8dd404cab980914fd34b0311515831ea0f6f92fc | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Sun Nov 17 08:03:59 2013 -0800 |
| committer | Andrey Andreev <narf@devilix.net> | Sun Nov 17 08:03:59 2013 -0800 |
| tree | 939e664365571d39d406124d06a8f9c6308d9aa7 | |
| parent | f696c6d5051b6f7df483676963c76dd17a763b2a [diff] | |
| parent | 1095d118eb1242091b36c00a2824d0ae7a15c8da [diff] |
Merge pull request #2731 from josephok/develop Update CodeIgniter.php
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index f0fe96c..1d41a19 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php
@@ -1338,7 +1338,7 @@ * returned by an Query Builder query. * * @param string - * @return string + * @return int */ public function count_all_results($table = '') {