浏览代码

Ensuring the conditions var is always an array

Fix for Illegal string offset errors in PHP v7.1.x
d[esign]Void 8 年之前
父节点
当前提交
762ef1a5bf
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      Model/Behavior/SoftDeleteBehavior.php

+ 1 - 1
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);