Fixes #5081

cakephp · Nov 5, 2014 · be0866f · be0866f
1 parent 8533409
commit be0866f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Database/Expression/QueryExpression.php b/src/Database/Expression/QueryExpression.php
@@ -483,7 +483,11 @@ protected function _addConditions(array $conditions, array $types) {
 				continue;
 			}
 
-			if ($c instanceof self && count($c) > 0) {
+			if ($c instanceof self && count($c) === 0) {
+				continue;
+			}
+
+			if ($numericKey && $c instanceof ExpressionInterface) {
 				$this->_conditions[] = $c;
 				continue;
 			}

diff --git a/tests/TestCase/ORM/QueryRegressionTest.php b/tests/TestCase/ORM/QueryRegressionTest.php
@@ -513,7 +513,8 @@ public function testOrConditionsWithExpression() {
 		$query = $table->find();
 		$query->where([
 			'OR' => [
-				new \Cake\Database\Expression\Comparison('id', 1, 'integer', '>')
+				new \Cake\Database\Expression\Comparison('id', 1, 'integer', '>'),
+				new \Cake\Database\Expression\Comparison('id', 3, 'integer', '<')
 			]
 		]);