Merge pull request #149 from paddya/patch-1

FormFlow::saveCurrentStepData() fails for embedded forms with file uploads
craue · Oct 6, 2014 · 03404b6 · 03404b6
2 parents 5001e8f + a47c592
commit 03404b6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Form/FormFlow.php b/Form/FormFlow.php
@@ -663,7 +663,7 @@ public function saveCurrentStepData(FormInterface $form) {
 		$currentStepData = $request->request->get($formName, array());
 
 		if ($this->handleFileUploads) {
-			$currentStepData = array_merge($currentStepData, $request->files->get($formName, array()));
+			$currentStepData = array_merge_recursive($currentStepData, $request->files->get($formName, array()));
 		}
 
 		$stepData[$this->currentStepNumber] = $currentStepData;