Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.515
diff -u -r1.515 common.inc
--- includes/common.inc	10 Feb 2006 05:25:57 -0000	1.515
+++ includes/common.inc	14 Feb 2006 16:03:59 -0000
@@ -170,14 +170,14 @@
     return 'destination='. urlencode($_REQUEST['destination']);
   }
   else {
-    $destination[] = $_GET['q'];
     $params = array('page', 'sort', 'order');
     foreach ($params as $param) {
       if (isset($_GET[$param])) {
-        $destination[] = "$param=". $_GET[$param];
+        $query[] = "$param=". $_GET[$param];
       }
     }
-    return 'destination='. urlencode(implode('&', $destination));
+    $querystring = (!empty($query)) ? ('?'.implode('&', $query)) : '';
+    return 'destination='.urlencode($_GET['q'].$querystring);
   }
 }