--- class.t3lib_div.php.orig	2005-05-18 15:11:55.747399000 +0200
+++ class.t3lib_div.php	2005-05-18 15:13:53.964427280 +0200
@@ -1324,7 +1324,7 @@
 					$str = t3lib_div::implodeArrayForUrl($thisKeyName,$AVal,$str,$skipBlank,$rawurlencodeParamName);
 				} else {
 					if (!$skipBlank || strcmp($AVal,''))	{
-						$str.='&'.($rawurlencodeParamName ? rawurlencode($thisKeyName) : $thisKeyName).
+						$str.='&'.($rawurlencodeParamName ? rawurlencode($thisKeyName) : $thisKeyName).
 							'='.rawurlencode($AVal);
 					}
 				}
@@ -1347,7 +1347,7 @@
 			return $tempGetVars;
 		} else {
 			$output = array();
-			$p = explode('&',$string);
+			$p = preg_split('/&(amp;)?/',$string);
 			foreach($p as $v)	{
 				if (strlen($v))	{
 					list($pK,$pV) = explode('=',$v,2);
@@ -3086,7 +3086,7 @@
 	 * @see tslib_fe::makeCacheHash(), tslib_cObj::typoLink()
 	 */
 	function cHashParams($addQueryParams) {
-		$params = explode('&',substr($addQueryParams,1));	// Splitting parameters up
+		$params = preg_split('/&(amp;)?/',substr($addQueryParams,1));	// Splitting parameters up
 
 			// Make array:
 		$pA = array();
@@ -3867,4 +3867,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>