diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
| commit | c4bd43432df03e4f4835c7689c8ed722cd2c3020 (patch) | |
| tree | 5603166833d78b0581bbe880adb53b6de085719d /system/database/DB_query_builder.php | |
| parent | 488ad40ba334ca506f07bede97724726eac2b27f (diff) | |
| parent | 9180a1264dc536c34e5cc8a0e44bb399a8ba484f (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 713bf18f3..7a008eeb8 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1271,7 +1271,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { */ protected function _limit($sql) { - return $sql.' LIMIT '.($this->qb_offset ? $this->qb_offset.', ' : '').$this->qb_limit; + return $sql.' LIMIT '.($this->qb_offset ? $this->qb_offset.', ' : '').(int) $this->qb_limit; } // -------------------------------------------------------------------- @@ -2340,7 +2340,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { .$this->_compile_order_by(); // ORDER BY // LIMIT - if ($this->qb_limit) + if ($this->qb_limit OR $this->qb_offset) { return $this->_limit($sql."\n"); } |