diff options
| author | purwandi <free6300@gmail.com> | 2011-09-08 14:02:08 +0200 |
|---|---|---|
| committer | purwandi <free6300@gmail.com> | 2011-09-08 14:02:08 +0200 |
| commit | a6529a2782d9f0942891dc9316f1e9955383f704 (patch) | |
| tree | 67509b9a2b5cc28a2bfce6a3fde452d47f026559 /system/database | |
| parent | e3bf976523e2c85fb942be1bba4deda068d55324 (diff) | |
| parent | bff3dfda42b58289c41f88342a0ab17846f52f3b (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_active_rec.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 89766e304..7162e2ac5 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -872,11 +872,11 @@ class CI_DB_active_record extends CI_DB_driver { * @param integer the offset value * @return object */ - public function limit($value, $offset = '') + public function limit($value, $offset = NULL) { $this->ar_limit = (int) $value; - if ($offset != '') + if ( ! is_null($offset)) { $this->ar_offset = (int) $offset; } |