diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-09-13 17:24:30 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-09-13 17:24:30 +0200 |
| commit | 8ee6c9379023df6594581e70827ba6196b3a2165 (patch) | |
| tree | 132a98413f34d44a9e4bd6f2d184691ee203a6b9 /system/database | |
| parent | 770c8677207be0a9091456b8d763bfd0e5456606 (diff) | |
| parent | 869e3721d75e9798a706d24d93170f44e5ab6cb3 (diff) | |
Merge branch 'develop' of git://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; } |