[BUGFIX] Respect linkVars for generating the cHash
authorHelmut Hummel <typo3@helmut-hummel.de>
Wed, 23 Nov 2011 11:52:06 +0000 (12:52 +0100)
committerSteffen Ritter <info@rs-websystems.de>
Fri, 25 Nov 2011 15:36:43 +0000 (16:36 +0100)
When implementing #28352 the linkVars have been skipped from
the calculation of the cHash, resulting in wrongly calculated cHash
parameters when linkVars are in place.

Add the linkVars again for creating the cHash

Change-Id: I10bc5e93d59294b6ec7fd2383e094b9f134beb44
Fixes: #32025
Related: #28352
Releases: 4.6, 4.7
Reviewed-on: http://review.typo3.org/6875
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers
Reviewed-by: Dmitry Dulepov
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
typo3/sysext/cms/tslib/class.tslib_content.php

index 20fafc0..24613b9 100644 (file)
@@ -5689,7 +5689,7 @@ class tslib_cObj {
                                                                // Mind the order below! See http://bugs.typo3.org/view.php?id=5117
                                                        $params = $GLOBALS['TSFE']->linkVars . $addQueryParams;
                                                        if (trim($params, '& ') != '') {
-                                                               $cHashParams = t3lib_div::cHashParams($addQueryParams);
+                                                               $cHashParams = t3lib_div::cHashParams($params);
                                                                if (count($cHashParams) > 1) {
                                                                        $addQueryParams .= '&cHash=' . t3lib_div::calculateCHash($cHashParams);
                                                                }