Merge pull request FluidTYPO3#1059 from mneuhaus/bugfix/tceforms-wrap…

…ping [BUGFIX] Prevent duplicate tceforms wrapping
parser11 · Jan 7, 2016 · aacde34 · aacde34
2 parents bf5035b + b3082b3
commit aacde34
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Classes/Backend/DynamicFlexForm.php b/Classes/Backend/DynamicFlexForm.php
@@ -94,13 +94,13 @@ public function getFlexFormDS_postProcessDS(&$dataStructArray, $conf, &$row, $ta
 	 * @param array $dataStructure
 	 * @return array
 	 */
-	protected function patchTceformsWrapper(array $dataStructure) {
+	protected function patchTceformsWrapper(array $dataStructure, $parentIndex = NULL) {
 		foreach ($dataStructure as $index => $subStructure) {
 			if (is_array($subStructure)) {
-				$dataStructure[$index] = $this->patchTceformsWrapper($subStructure);
+				$dataStructure[$index] = $this->patchTceformsWrapper($subStructure, $index);
 			}
 		}
-		if (isset($dataStructure['config']) && !isset($dataStructure['TCEforms'])) {
+		if (isset($dataStructure['config']) && $parentIndex !== 'TCEforms') {
 			$dataStructure = array('TCEforms' => $dataStructure);
 		}
 		return $dataStructure;