[FOLLOWUP] Fix override field handling in form engine 69/39169/2
authorHelmut Hummel <helmut.hummel@typo3.org>
Fri, 1 May 2015 18:42:46 +0000 (20:42 +0200)
committerNicole Cordes <typo3@cordes.co>
Fri, 1 May 2015 18:44:44 +0000 (20:44 +0200)
Remove duplicate code.

Resolves: #66705
Releases: master
Change-Id: Ib38862f30f85f7528166c7c3597fe2357dfa50f2
Reviewed-on: http://review.typo3.org/39169
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
typo3/sysext/backend/Classes/Form/Container/PaletteAndSingleContainer.php

index 335b41e..18d4c91 100644 (file)
@@ -274,10 +274,8 @@ class PaletteAndSingleContainer extends AbstractContainer {
                                                'fieldHtml' => $singleFieldContentArray['html'],
                                        );
                                        $singleFieldContentArray['html'] = '';
-                                       $this->resultArray = $this->mergeChildReturnIntoExistingResult($this->resultArray, $singleFieldContentArray);
-                               } else {
-                                       $this->resultArray = $this->mergeChildReturnIntoExistingResult($this->resultArray, $singleFieldContentArray);
                                }
+                               $this->resultArray = $this->mergeChildReturnIntoExistingResult($this->resultArray, $singleFieldContentArray);
                        }
                }