[BUGIFX] Merge settings declared before by other extensions

FluidTYPO3 · Nov 19, 2015 · d34d2aa · d34d2aa
1 parent 805c35c
commit d34d2aa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Classes/Controller/AbstractFluxController.php b/Classes/Controller/AbstractFluxController.php
@@ -103,8 +103,11 @@ protected function initializeSettings() {
 		$extensionKey = $this->provider->getExtensionKey($row);
 		$extensionName = ExtensionNamingUtility::getExtensionName($extensionKey);
 		$pluginName = $this->request->getPluginName();
-		$this->settings = (array) $this->configurationManager->getConfiguration(
-			ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS, $extensionName, $pluginName
+		$this->settings = RecursiveArrayUtility::merge(
+			(array) $this->configurationManager->getConfiguration(
+				ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS, $extensionName, $pluginName
+			),
+			$this->settings
 		);
 		$this->data = $this->provider->getFlexFormValues($row);
 		$this->setup = $this->provider->getTemplatePaths($row);