Skip to content
Snippets Groups Projects
Commit 8062913c authored by Andreas Häfner's avatar Andreas Häfner Committed by Oliver Hader
Browse files

[BUGFIX] Localization file not loaded in backend form wizard

The changes for issue #39280 did not consider that the localization file
for the frontend controller is used in the backend controller as well and
thus, this tiny regression got in, leading to not loading the language
labels anymore in the backend form wizard.

Resolves: #69433
Releases: master
Change-Id: Ia27b5e321f2308cf4c3d3cecdfcb3419b4d4397b
Reviewed-on: http://review.typo3.org/43307


Reviewed-by: default avatarOliver Hader <oliver.hader@typo3.org>
Tested-by: default avatarOliver Hader <oliver.hader@typo3.org>
parent e3068177
No related merge requests found
......@@ -260,7 +260,7 @@ class WizardView extends \TYPO3\CMS\Form\View\Wizard\AbstractWizardView {
*/
protected function loadLocalization() {
$wizardLabels = $this->getLanguageService()->includeLLFile('EXT:form/Resources/Private/Language/locallang_wizard.xlf', FALSE, TRUE);
$controllerLabels = $this->getLanguageService()->includeLLFile('EXT:form/Resources/Private/Language/locallang_controller.xlf', FALSE, TRUE);
$controllerLabels = $this->getLanguageService()->includeLLFile('EXT:form/Resources/Private/Language/locallang.xlf', FALSE, TRUE);
\TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($controllerLabels, $wizardLabels);
$this->getPageRenderer()->addInlineLanguageLabelArray($controllerLabels['default']);
}
......
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