Changed the order of the Select condition, to add the first instances…

… PredicateInterface
moura137 · Feb 8, 2013 · 9d5624c · 9d5624c
1 parent 469972c
commit 9d5624c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/library/Zend/Db/Sql/Select.php b/library/Zend/Db/Sql/Select.php
@@ -286,6 +286,10 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
                         // as an Expression predicate
                         $predicate = new Predicate\Expression($pkey, $pvalue);
 
+                    } elseif ($pvalue instanceof Predicate\PredicateInterface) {
+                        // Predicate type is ok
+                        $predicate = $pvalue;
+
                     } elseif (is_string($pkey)) {
                         // Otherwise, if still a string, do something intelligent with the PHP type provided
 
@@ -299,9 +303,6 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
                             // otherwise assume that array('foo' => 'bar') means "foo" = 'bar'
                             $predicate = new Predicate\Operator($pkey, Predicate\Operator::OP_EQ, $pvalue);
                         }
-                    } elseif ($pvalue instanceof Predicate\PredicateInterface) {
-                        // Predicate type is ok
-                        $predicate = $pvalue;
                     } else {
                         // must be an array of expressions (with int-indexed array)
                         $predicate = (strpos($pvalue, Expression::PLACEHOLDER) !== false)