Skip to content
Snippets Groups Projects
Commit c7b262f4 authored by Helmut Hummel's avatar Helmut Hummel Committed by Benni Mack
Browse files

[BUGFIX] Always merge results from empty tabs

When rendering child elements of a tabs, not only
the rendered HTML is collected from these child elements,
but also hidden fields HTML, assets and a lot more.

Therefore it is crucial to merge the child results regardless
of whether the "html" property is empty.

Releases: master, 10.4, 9.5
Resolves: #91636
Relates: #89094
Change-Id: If169bd6486d3001466464462b29788b94fbb0943
parent eb0d4528
No related merge requests found
......@@ -104,9 +104,8 @@ class FlexFormTabsContainer extends AbstractContainer
'description' => trim($sheetDataStructure['ROOT']['sheetDescription']) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetDescription'])) : '',
'linkTitle' => trim($sheetDataStructure['ROOT']['sheetShortDescr']) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetShortDescr'])) : '',
];
$resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childReturn, false);
}
$resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childReturn, false);
}
$fieldInformationResult = $this->renderFieldInformation();
......
......@@ -91,8 +91,8 @@ class TabsContainer extends AbstractContainer
'label' => $tabWithLabelAndElements['label'],
'content' => $childArray['html'],
];
$resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childArray, false);
}
$resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childArray, false);
}
$resultArray['html'] = $this->renderTabMenu($tabElements, $domIdPrefix);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment