Safeguard against bad developer input.

Don't try to recurse into associations that may not be defined.
cakephp · Dec 13, 2013 · c32a1d1 · c32a1d1
1 parent 54e9606
commit c32a1d1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Cake/ORM/Marshaller.php b/Cake/ORM/Marshaller.php
@@ -66,8 +66,11 @@ public function one(array $data, $include = []) {
 
 		$entity = new $entityClass();
 		foreach ($data as $key => $value) {
+			$assoc = null;
 			if (array_key_exists($key, $include)) {
 				$assoc = $this->_table->association($key);
+			}
+			if ($assoc) {
 				$value = $this->_marshalAssociation($assoc, $value, $include[$key]);
 				$entity->set($assoc->property(), $value);
 			} else {