Merge pull request #193 from designvoid/designvoid-patch-1

Ensuring the conditions var is always an array

Model/Behavior/SoftDeleteBehavior.php

@@ -346,7 +346,7 @@ class SoftDeleteBehavior extends ModelBehavior {
 
 					$conditions = $model->{$parentModel}->{$assocType}[$assoc]['conditions'];
 					if (!is_array($conditions)) {
-						$model->{$parentModel}->{$assocType}[$assoc]['conditions'] = [];
+						$conditions = [];
 					}
 
 					$multiFields = 1 < count($fields);