[BUGFIX] XLIFF: Invalid handling of overlays for unavailable language
[Packages/TYPO3.CMS.git] / typo3 / sysext / lang / lang.php
index 2b83b8f..fa24065 100755 (executable)
@@ -548,7 +548,7 @@ class language {
                        if (!isset($localLanguage[$this->lang])) {
                                $localLanguage[$this->lang] = $localLanguage['default'];
                        }
-                       if ($this->lang !== 'default') {
+                       if ($this->lang !== 'default' && isset($tempLL[$language])) {
                                        // Merge current language labels onto labels from previous language
                                        // This way we have a labels with fall back applied
                                $localLanguage[$this->lang] = t3lib_div::array_merge_recursive_overrule($localLanguage[$this->lang], $tempLL[$language], FALSE, FALSE);