Merge pull request #11301 from ifsnow/2.0.x-fix-issue-11298

Fixed for Builder bug (#11298)
phalcon · Jan 13, 2016 · 649f3cd · 649f3cd
2 parents a94d7b5 + 9508b31
commit 649f3cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Fixed `Phalcon\Acl\Memory::allow` bug[#11210] related to the inconsistent behavior with access specified as string and array
 - Added quoting column in `Phalcon\Db\Dialect\MySQL::addColumn` when define position of the column
 - Added support to define position of the column in `Phalcon\Db\Dialect\MySQL::modifyColumn`
+- Fixed `Phalcon\Mvc\Model\Query\Builder` bug[#11298] related to resetting limit to null
 
 # [2.0.9](https://github.com/phalcon/cphalcon/releases/tag/phalcon-v2.0.9) (2015-11-24)
 - Fixed bug that double serializes data using Redis adapter

diff --git a/phalcon/mvc/model/query/builder.zep b/phalcon/mvc/model/query/builder.zep
@@ -904,11 +904,11 @@ class Builder implements BuilderInterface, InjectionAwareInterface
 	 *	$builder->limit(100, 20);
 	 *</code>
 	 */
-	public function limit(int limit = null, int offset = null) -> <Builder>
+	public function limit(var limit = null, var offset = null) -> <Builder>
 	{
 		let this->_limit = limit;
-		if offset {
-			let this->_offset = offset;
+		if is_numeric(offset) {
+			let this->_offset = (int)offset;
 		}
 		return this;
 	}