Merge pull request Sylius#1487 from aRn0D/fix/criteria

[ResourBundle] The criteria don't care about empties values
pamil · May 14, 2014 · 37871d3 · 37871d3
2 parents fbc69dd + fc6b5a1
commit 37871d3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Doctrine/ORM/EntityRepository.php b/Doctrine/ORM/EntityRepository.php
@@ -161,12 +161,12 @@ protected function applyCriteria(QueryBuilder $queryBuilder, array $criteria = n
             if (null === $value) {
                 $queryBuilder
                     ->andWhere($queryBuilder->expr()->isNull($this->getPropertyName($property)));
-            } elseif (!is_array($value)) {
+            } elseif (is_array($value)) {
+                $queryBuilder->andWhere($queryBuilder->expr()->in($this->getPropertyName($property), $value));
+            } elseif ('' !== $value) {
                 $queryBuilder
                     ->andWhere($queryBuilder->expr()->eq($this->getPropertyName($property), ':' . $property))
                     ->setParameter($property, $value);
-            } else {
-                $queryBuilder->andWhere($queryBuilder->expr()->in($this->getPropertyName($property), $value));
             }
         }
     }