[BUGFIX] Use `modTSconfig` for default language label, if set 74/47374/2
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Wed, 23 Mar 2016 18:06:28 +0000 (19:06 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Wed, 23 Mar 2016 19:32:51 +0000 (20:32 +0100)
Due to a wrong assignment, modSharedTSconfig is always used
to set the default language label in PageLayoutController, even if
modTSconfig is set.

modTSconfig is now used if possible.

Resolves: #75242
Releases: master, 7.6, 6.2
Change-Id: I517c03f02ffc8d05ed74a865517ee775e1542bfe
Reviewed-on: https://review.typo3.org/47374
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Controller/PageLayoutController.php

index 18fa9ea..21ecd40 100755 (executable)
@@ -403,7 +403,7 @@ class PageLayoutController
         }
         // Setting alternative default label:
         if (($this->modSharedTSconfig['properties']['defaultLanguageLabel'] || $this->modTSconfig['properties']['defaultLanguageLabel']) && isset($this->MOD_MENU['language'][0])) {
-            $this->MOD_MENU['language'][0] = $this->modTSconfig['properties']['defaultLanguageLabel'] ? $this->modSharedTSconfig['properties']['defaultLanguageLabel'] : $this->modSharedTSconfig['properties']['defaultLanguageLabel'];
+            $this->MOD_MENU['language'][0] = $this->modTSconfig['properties']['defaultLanguageLabel'] ? $this->modTSconfig['properties']['defaultLanguageLabel'] : $this->modSharedTSconfig['properties']['defaultLanguageLabel'];
         }
         // Clean up settings
         $this->MOD_SETTINGS = BackendUtility::getModuleData($this->MOD_MENU, GeneralUtility::_GP('SET'), $this->moduleName);