[BUGFIX] adjust configuration handling to #55569 50/27350/2
authorFelix Oertel <felix@oer.tel>
Wed, 5 Feb 2014 08:09:42 +0000 (09:09 +0100)
committerJigal van Hemert <jigal.van.hemert@typo3.org>
Wed, 5 Feb 2014 09:04:03 +0000 (10:04 +0100)
In #55569 we got rid of the empty TypoScript generated by
default. The configurationManager relies on the empty
arrays to be present, before merging. This patch removes
this necessity.

Resolves: #55687
Releases: 6.2
Change-Id: I7f5ec4f7d120ffa45c8b526817debbc5fd38fe4f
Reviewed-on: https://review.typo3.org/27350
Tested-by: Christian Weiske
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Jigal van Hemert
Tested-by: Jigal van Hemert
typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php

index d9b35f5..d2674dd 100644 (file)
@@ -191,8 +191,12 @@ class FrontendConfigurationManager extends \TYPO3\CMS\Extbase\Configuration\Abst
         * @return array the processed framework configuration
         */
        protected function mergeConfigurationIntoFrameworkConfiguration(array $frameworkConfiguration, array $configuration, $configurationPartName) {
-               if (is_array($frameworkConfiguration[$configurationPartName]) && is_array($configuration[$configurationPartName])) {
-                       \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($frameworkConfiguration[$configurationPartName], $configuration[$configurationPartName]);
+               if (is_array($configuration[$configurationPartName])) {
+                       if (is_array($frameworkConfiguration[$configurationPartName])) {
+                               \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($frameworkConfiguration[$configurationPartName], $configuration[$configurationPartName]);
+                       } else {
+                               $frameworkConfiguration[$configurationPartName] = $configuration[$configurationPartName];
+                       }
                }
                return $frameworkConfiguration;
        }