summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorDarren Hill <dchill42@gmail.com>2011-09-12 13:57:04 +0200
committerDarren Hill <dchill42@gmail.com>2011-09-12 13:57:04 +0200
commit00fcb545109d4e61bc14e403ec828749c34a54b3 (patch)
tree336473d0e3a85ce90cc463784f631c3d52462605 /system/database
parent826675178c2c2ad697e5ac55161645abd9143bef (diff)
parent869e3721d75e9798a706d24d93170f44e5ab6cb3 (diff)
Updated cookie driver to latest develop changes
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_active_rec.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 37d162bc1..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;
}
@@ -894,7 +894,7 @@ class CI_DB_active_record extends CI_DB_driver {
*/
public function offset($offset)
{
- $this->ar_offset = $offset;
+ $this->ar_offset = (int) $offset;
return $this;
}