bug: target and junction conditions not reset properly

cakephp · Jun 21, 2016 · 2b5efd2 · 2b5efd2
1 parent 61a570b
commit 2b5efd2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
@@ -799,7 +799,7 @@ public function conditions($conditions = null)
     {
         if ($conditions !== null) {
             $this->_conditions = $conditions;
-            $this->_targetConditions = $this->_junctionConditions = [];
+            $this->_targetConditions = $this->_junctionConditions = null;
         }
         return $this->_conditions;
     }