From 831ba8c01e1a2922298f7829a54b10529d89a118 Mon Sep 17 00:00:00 2001 From: Roman Leitner Date: Wed, 8 Nov 2017 11:10:49 +0100 Subject: [PATCH 1/2] Update handler.php GeneralUtility::array_merge_recursive_overrule is a depreciated method of 6.2, has been moved to ArrayUtility::mergeRecursiveWithOverrule. Thats why your operator is wrong, should be ">". --- Classes/Handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Handler.php b/Classes/Handler.php index afe0d05..a3f3645 100755 --- a/Classes/Handler.php +++ b/Classes/Handler.php @@ -198,7 +198,7 @@ protected function mergeTypoScript( ); unset($linkConfigurationArray[$recordTableName . '.']['additionalParams.']); - if (version_compare(TYPO3_version, '6.2.0', '<')) { + if (version_compare(TYPO3_version, '6.2.0', '>')) { $mergeLinkConfigurationArray = \TYPO3\CMS\Core\Utility\GeneralUtility::explodeUrl2Array( $linkConfigurationArray[$recordTableName . '.']['additionalParams'] ); From 42c2c9ab50f28ca016ef7a127ebf4517ae1fbd2a Mon Sep 17 00:00:00 2001 From: Roman Leitner Date: Thu, 9 Nov 2017 10:35:11 +0100 Subject: [PATCH 2/2] Update Handler.php Removed condition to check T3 version, not needed because methods ArrayUtility::mergeRecursiveWithOverrule and GeneralUtility::explodeUrl2Array are available in both T3 versions 6.2.x and 7.6.x. --- Classes/Handler.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Classes/Handler.php b/Classes/Handler.php index a3f3645..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)) {