From f5b2c0a195c49a2f929f29a3c807c62a15dc95a5 Mon Sep 17 00:00:00 2001 From: Dan Steele Date: Thu, 10 Mar 2016 11:41:18 -0600 Subject: [PATCH] Cast null settings to empty array so Hash::get works as expected --- src/Model/Behavior/UploadBehavior.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Model/Behavior/UploadBehavior.php b/src/Model/Behavior/UploadBehavior.php index 9d8c8d78..cdbe0970 100644 --- a/src/Model/Behavior/UploadBehavior.php +++ b/src/Model/Behavior/UploadBehavior.php @@ -74,6 +74,7 @@ public function beforeSave(Event $event, Entity $entity, ArrayObject $options) continue; } + $settings = ($settings === null) ? [] : $settings; $data = $entity->get($field); $path = $this->getPathProcessor($entity, $data, $field, $settings); $basepath = $path->basepath();