[BUGFIX] Merge requireJsModules in IRRE 51/44151/4
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Mon, 19 Oct 2015 09:56:01 +0000 (11:56 +0200)
committerFrank Nägler <frank.naegler@typo3.org>
Mon, 19 Oct 2015 15:17:57 +0000 (17:17 +0200)
commitf76c8cdb5f302a301b049b235ee8a1c9da46bee4
tree565c21c4e8be4af7cced23d5ce5ed48c4b76461e
parent3bfc7444f98e8be2b033f7dcbcff0615fb0b4a0e
[BUGFIX] Merge requireJsModules in IRRE

The $resultArray is built with mergeChildReturnIntoExistingResult but
the requireJsModules array is overridden at a later point, resulting in
loss of modules returned by the method mentioned before.

Both arrays are merged now to keep the returned requireJsModules.

Resolves: #70832
Releases: master
Change-Id: I6f0c02199b24f022f663916e3e8b8b5a12e8ef65
Reviewed-on: http://review.typo3.org/44151
Reviewed-by: Stephan Großberndt <stephan@grossberndt.de>
Reviewed-by: Benjamin Kott <info@bk2k.info>
Tested-by: Benjamin Kott <info@bk2k.info>
Reviewed-by: Sebastian Seidelmann <sebastian.seidelmann@gmail.com>
Tested-by: Sebastian Seidelmann <sebastian.seidelmann@gmail.com>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php