From 6faa23d0ff118b6857f6861588efe80b3887ae6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Sun, 23 Nov 2014 16:38:23 +0100 Subject: [PATCH] [TASK] Adapt to new wrapper method in Flux --- Classes/Service/ConfigurationService.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/Service/ConfigurationService.php b/Classes/Service/ConfigurationService.php index 5318e719..939020a1 100644 --- a/Classes/Service/ConfigurationService.php +++ b/Classes/Service/ConfigurationService.php @@ -27,6 +27,7 @@ use FluidTYPO3\Flux\Core; use FluidTYPO3\Flux\Service\FluxService; use FluidTYPO3\Flux\Utility\ExtensionNamingUtility; +use FluidTYPO3\Flux\Utility\RecursiveArrayUtility; use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\SingletonInterface; use TYPO3\CMS\Core\Utility\GeneralUtility; @@ -122,7 +123,7 @@ public function getPageConfiguration($extensionName = NULL) { } $newLocation = (array) $this->getTypoScriptSubConfiguration($extensionName, 'collections', 'fluidpages'); $oldLocation = (array) $this->getTypoScriptSubConfiguration($extensionName, 'page', 'fed'); - $merged = (array) GeneralUtility::array_merge_recursive_overrule($oldLocation, $newLocation); + $merged = RecursiveArrayUtility::mergeRecursiveOverrule($oldLocation, $newLocation); if (NULL === $extensionName) { $registeredExtensionKeys = Core::getRegisteredProviderExtensionKeys('Page'); foreach ($registeredExtensionKeys as $registeredExtensionKey) { @@ -141,7 +142,7 @@ public function getPageConfiguration($extensionName = NULL) { } else { $nativeViewLocation = $this->getViewConfigurationForExtensionName($extensionName); if (TRUE === is_array($nativeViewLocation)) { - $merged = GeneralUtility::array_merge_recursive_overrule($nativeViewLocation, $merged); + $merged = RecursiveArrayUtility::mergeRecursiveOverrule($nativeViewLocation, $merged); } if (FALSE === isset($nativeViewLocation['extensionKey'])) { $merged['extensionKey'] = ExtensionNamingUtility::getExtensionKey($extensionName);