Merge pull request #216 from bjo3rnf/compat

[TASK] Adapt to new wrapper method in Flux
FluidTYPO3 · Nov 28, 2014 · c82b035 · c82b035
2 parents 4109cff + 6faa23d
commit c82b035
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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);