--- class.tslib_fe.php.orig	2005-05-18 14:56:13.738606104 +0200
+++ class.tslib_fe.php	2005-05-18 14:58:16.571932600 +0200
@@ -1144,7 +1144,7 @@
 	 */
 	function setIDfromArgV()	{
 		if (!$this->id)	{
-			list($theAlias) = explode('&',t3lib_div::getIndpEnv('QUERY_STRING'));
+			list($theAlias) = explode('&',t3lib_div::getIndpEnv('QUERY_STRING'));
 			$theAlias = trim($theAlias);
 			$this->id = $theAlias ? $theAlias : 0;
 		}
@@ -2095,7 +2095,7 @@
 				$TSConf = $this->getPagesTSconfig();
 				if ($TSConf['TSFE.']['jumpUrl_transferSession'])	{
 					$uParts = parse_url($this->jumpurl);
-					$params = '&FE_SESSION_KEY='.rawurlencode($this->fe_user->id.'-'.md5($this->fe_user->id.'/'.$this->TYPO3_CONF_VARS['SYS']['encryptionKey']));
+					$params = '&FE_SESSION_KEY='.rawurlencode($this->fe_user->id.'-'.md5($this->fe_user->id.'/'.$this->TYPO3_CONF_VARS['SYS']['encryptionKey']));
 					$this->jumpurl.=($uParts['query']?'':'?').$params;	// Add the session parameter ...
 				}
 				Header('Location: '.$this->jumpurl);
@@ -3064,7 +3064,7 @@
 	function simulateStaticDocuments_pEnc_onlyP_proc($linkVars)	{
 		$remainLinkVars = '';
 		if (strcmp($linkVars,''))	{
-			$p = explode('&',$linkVars);
+			$p = preg_split('/&(amp;)?/',$linkVars);
 			sort($p);	// This sorts the parameters - and may not be needed and further it will generate new MD5 hashes in many cases. Maybe not so smart. Hmm?
 			$rem = array();
 			foreach($p as $k => $v)	{
@@ -3078,8 +3078,8 @@
 				} else unset($p[$k]);
 			}
 
-			$linkVars = count($p) ? '&'.implode('&',$p) : '';
-			$remainLinkVars = count($rem) ? '&'.implode('&',$rem) : '';
+			$linkVars = count($p) ? '&'.implode('&',$p) : '';
+			$remainLinkVars = count($rem) ? '&'.implode('&',$rem) : '';
 		}
 		return array($linkVars, $remainLinkVars);
 	}
@@ -3668,4 +3668,4 @@
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_fe.php'])	{
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_fe.php']);
 }
-?>
\ No newline at end of file
+?>