Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 9921)
+++ wp-includes/functions.php	(working copy)
@@ -1206,7 +1206,7 @@
 
 	$ret = build_query( $qs );
 	$ret = trim( $ret, '?' );
-	$ret = preg_replace( '#=(&|$)#', '$1', $ret );
+	$ret = preg_replace( '#=(&amp;|$)#', '$1', $ret );
 	$ret = $protocol . $base . $ret . $frag;
 	$ret = rtrim( $ret, '?' );
 	return $ret;
