--- common475_old.inc	2007-01-06 17:27:41.000000000 +0200
+++ common475.inc	2007-01-06 17:32:42.000000000 +0200
@@ -206,7 +206,7 @@ function drupal_query_string_encode($que
  */
 function drupal_get_destination() {
   if (isset($_REQUEST['destination'])) {
-    return 'destination='. urlencode($_REQUEST['destination']);
+    return 'destination='. $_REQUEST['destination'];
   }
   else {
     // Use $_GET here to retrieve the original path in source form.
@@ -215,7 +215,7 @@ function drupal_get_destination() {
     if ($query != '') {
       $path .= '?'. $query;
     }
-    return 'destination='. urlencode($path);
+    return 'destination='. $path;
   }
 }
 
@@ -1046,7 +1046,7 @@ function url($path = NULL, $query = NULL
     }
     else {
       if (isset($query)) {
-        return $base . $path .'?'. $query . $fragment;
+        return $base . $path .'&'. $query . $fragment;
       }
       else {
         return $base . $path . $fragment;