[BUGFIX] Always use uc_default after first install
[Packages/TYPO3.CMS.git] / typo3 / sysext / core / Classes / Authentication / BackendUserAuthentication.php
index e5fcc1b..42b433d 100644 (file)
@@ -2359,11 +2359,17 @@ This is a dump of the failures:
                }
                // Setting defaults if uc is empty
                $updated = FALSE;
+               $originalUc = array();
+               if (is_array($this->uc) && isset($this->uc['ucSetByInstallTool'])) {
+                       $originalUc = $this->uc;
+                       unset($originalUc['ucSetByInstallTool'], $this->uc);
+               }
                if (!is_array($this->uc)) {
                        $this->uc = array_merge(
                                $this->uc_default,
                                (array)$GLOBALS['TYPO3_CONF_VARS']['BE']['defaultUC'],
-                               GeneralUtility::removeDotsFromTS((array)$this->getTSConfigProp('setup.default'))
+                               GeneralUtility::removeDotsFromTS((array)$this->getTSConfigProp('setup.default')),
+                               $originalUc
                        );
                        $this->overrideUC();
                        $updated = TRUE;