Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(Revision 3579)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(Arbeitskopie)
@@ -5202,11 +5202,19 @@
 							// Query Params:
 						$addQueryParams = $conf['addQueryString'] ? $this->getQueryArguments($conf['addQueryString.']) : '';
 						$addQueryParams .= trim($this->stdWrap($conf['additionalParams'],$conf['additionalParams.']));
+						if (strstr($addQueryParams,'&cHash=')) {
+							$conf['useCacheHash'] = 1;
+						}
 						if (substr($addQueryParams,0,1)!='&')		{
 							$addQueryParams = '';
 						} elseif ($conf['useCacheHash']) {	// cache hashing:
-							$pA = t3lib_div::cHashParams($addQueryParams.$GLOBALS['TSFE']->linkVars);	// Added '.$this->linkVars' dec 2003: The need for adding the linkVars is that they will be included in the link, but not the cHash. Thus the linkVars will always be the problem that prevents the cHash from working. I cannot see what negative implications in terms of incompatibilities this could bring, but for now I hope there are none. So here we go... (- kasper)
-							$addQueryParams.= '&cHash='.t3lib_div::shortMD5(serialize($pA));
+							$addQueryParams = preg_replace('/&cHash=[0-9A-Za-z]+/','',$addQueryParams);	// cHash parameter is wiped before being rebuilt
+							$pA = t3lib_div::cHashParams($GLOBALS['TSFE']->linkVars.$addQueryParams);	// Added '.$this->linkVars' dec 2003: The need for adding the linkVars is that they will be included in the link, but not the cHash. Thus the linkVars will always be the problem that prevents the cHash from working. I cannot see what negative implications in terms of incompatibilities this could bring, but for now I hope there are none. So here we go... (- kasper)
+							if (count($pA)==2 && isset($pA['L'])) {
+								// Skipping cHash creation because only "id" and "L" are set
+							} else {
+								$addQueryParams.= '&cHash='.t3lib_div::shortMD5(serialize($pA));
+							}
 						}
 
 						$tCR_domain = '';