summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-10 17:00:52 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-10 17:00:52 +0200
commitb0eae5f81a4cb92911bb215ad814ae5caef4f61d (patch)
treee2ce1502f05608991324b36d2a034f0347f0edb7
parent277c57c5c43a0f3ede09d679085485bc50c44b88 (diff)
Typecast limit and offset in the Database Driver to integers. Fixes https://bitbucket.org/ellislab/codeigniter-reactor/issue/341/active-record-limit-function-have-sql#comment-597403
-rw-r--r--system/database/DB_active_rec.php4
-rw-r--r--user_guide/changelog.html1
2 files changed, 3 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 0238c7348..7bab729f5 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -870,11 +870,11 @@ class CI_DB_active_record extends CI_DB_driver {
*/
public function limit($value, $offset = '')
{
- $this->ar_limit = $value;
+ $this->ar_limit = (int) $value;
if ($offset != '')
{
- $this->ar_offset = $offset;
+ $this->ar_offset = (int) $offset;
}
return $this;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 7b74be0d9..9fbadbf2f 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -77,6 +77,7 @@ Change Log
<li class="reactor">Added <samp>insert_batch()</samp> function to the PostgreSQL database driver. Thanks to epallerols for the patch.</li>
<li class="reactor">Callback validation rules can now accept parameters like any other validation rule.</li>
<li class="reactor">Added "application/x-csv" to mimes.php.</li>
+ <li class="reactor">Typecast limit and offset in the <a href="database/queries.html">Database Driver</a> to integers.</li>
</ul>
</li>
<li>Helpers