diff --git a/Classes/Handler.php b/Classes/Handler.php index afe0d05..c47a5fa 100755 --- a/Classes/Handler.php +++ b/Classes/Handler.php @@ -198,20 +198,10 @@ protected function mergeTypoScript( ); unset($linkConfigurationArray[$recordTableName . '.']['additionalParams.']); - if (version_compare(TYPO3_version, '6.2.0', '<')) { - $mergeLinkConfigurationArray = \TYPO3\CMS\Core\Utility\GeneralUtility::explodeUrl2Array( - $linkConfigurationArray[$recordTableName . '.']['additionalParams'] - ); - \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule( - $mergeLinkConfigurationArray, - \TYPO3\CMS\Core\Utility\GeneralUtility::explodeUrl2Array($typoLinkConfigurationArray['additionalParams']) - ); - } else { - $mergeLinkConfigurationArray = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule( - \TYPO3\CMS\Core\Utility\GeneralUtility::explodeUrl2Array($linkConfigurationArray[$recordTableName . '.']['additionalParams']), - \TYPO3\CMS\Core\Utility\GeneralUtility::explodeUrl2Array($typoLinkConfigurationArray['additionalParams']) - ); - } + $mergeLinkConfigurationArray = \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule( + \TYPO3\CMS\Core\Utility\GeneralUtility::explodeUrl2Array($linkConfigurationArray[$recordTableName . '.']['additionalParams']), + \TYPO3\CMS\Core\Utility\GeneralUtility::explodeUrl2Array($typoLinkConfigurationArray['additionalParams']) + ); // merge recursive the "additionalParams" from "$typoScriptConfiguration" with the "$typoLinkConfigurationArray" if (array_key_exists('additionalParams', $typoLinkConfigurationArray)) {