Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.174.2.11
diff -u -p -r1.174.2.11 form.inc
--- includes/form.inc	26 Jul 2007 19:16:45 -0000	1.174.2.11
+++ includes/form.inc	28 Aug 2007 19:15:16 -0000
@@ -489,6 +489,7 @@ function drupal_render_form($form_id, &$
  *
  */
 function drupal_redirect_form($form, $redirect = NULL) {
+  global $base_url;
   if (isset($redirect)) {
     $goto = $redirect;
   }
@@ -500,7 +501,7 @@ function drupal_redirect_form($form, $re
       call_user_func_array('drupal_goto', $goto);
     }
     elseif (!isset($goto)) {
-      drupal_goto($_GET['q']);
+      drupal_goto($base_url . request_uri());
     }
     else {
       drupal_goto($goto);