Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php	(revision 6395)
+++ t3lib/class.t3lib_div.php	(working copy)
@@ -3605,7 +3605,7 @@
 	 * @param	array		Array of GET parameters to include
 	 * @return	string
 	 */
-	public static function linkThisScript(array $getParams = array()) {
+	public static function linkThisScript(array $getParams = array(), $xhtmlMode = TRUE) {
 		$parts = t3lib_div::getIndpEnv('SCRIPT_NAME');
 		$params = t3lib_div::_GET();
 
@@ -3618,8 +3618,8 @@
 		}
 
 		$pString = t3lib_div::implodeArrayForUrl('', $params);
-
-		return $pString ? $parts . '?' . preg_replace('/^&/', '', $pString) : $parts;
+		$pString = $pString ? $parts . '?' . preg_replace('/^&/', '', $pString) : $parts;
+		return $xhtmlMode ? preg_replace('/&(?!amp;)/', '&', $pString) : $pString;
 	}
 
 	/**