[BUGFIX] Fix parameters in recursiveConfigurationFetching() call 95/54095/2
authorSimon Praetorius <simon@praetorius.me>
Sun, 10 Sep 2017 09:45:24 +0000 (11:45 +0200)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Sun, 10 Sep 2017 13:22:02 +0000 (15:22 +0200)
Resolves: #82435
Relates: #82399
Releases: master
Change-Id: Ic2bb90883c0a6cec5e6bec051cb308c723392d75
Reviewed-on: https://review.typo3.org/54095
Reviewed-by: Markus Hölzle <typo3@markus-hoelzle.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
typo3/sysext/install/Classes/Service/LocalConfigurationValueService.php

index 83904f5..df1a28b 100644 (file)
@@ -85,7 +85,8 @@ class LocalConfigurationValueService
             $newPath[] = $key;
 
             if ($descriptionType === 'container') {
-                $data = array_merge($data, $this->recursiveConfigurationFetching($value, $descriptionInfo, $newPath));
+                $valueFromCurrentConfiguration = $sectionsFromCurrentConfiguration[$key] ?? null;
+                $data = array_merge($data, $this->recursiveConfigurationFetching($value, $valueFromCurrentConfiguration, $descriptionInfo, $newPath));
             } elseif (!preg_match('/[' . LF . CR . ']/', (string)$value) || $descriptionType === 'multiline') {
                 $itemData = [];
                 $itemData['key'] = implode('/', $newPath);