? globalredirect-938640.patch
Index: globalredirect.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/globalredirect/globalredirect.module,v
retrieving revision 1.1.2.4.2.5.2.31
diff -u -p -r1.1.2.4.2.5.2.31 globalredirect.module
--- globalredirect.module	13 Jul 2010 00:54:36 -0000	1.1.2.4.2.5.2.31
+++ globalredirect.module	11 Oct 2010 21:39:08 -0000
@@ -90,7 +90,14 @@ function globalredirect_init() {
     elseif ($settings['nonclean_to_clean'] &&
             ((bool)variable_get('clean_url', 0)) &&
             (strpos(request_uri(), '?q=') || strpos(request_uri(), 'index.php'))) {
-      drupal_goto('', $query_string, NULL, 301);
+      $parts = @parse_url(request_uri());
+      if (!empty($parts)) {
+        $uri = ltrim(str_replace('index.php', '', $parts['path']), '/');
+      }
+      else {
+        $uri = '';
+      }
+      drupal_goto($uri, $query_string, NULL, 301);
     }
     // If we've got to this point then we're on a front page with a VALID
     // request path (such as a language-prefix front page such as '/de')