Skip to content
Snippets Groups Projects
Commit 73698ff7 authored by Felix Oertel's avatar Felix Oertel Committed by Jigal van Hemert
Browse files

[BUGFIX] adjust configuration handling to #55569

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
parent 5708fafa
No related merge requests found
......@@ -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;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment