=== modified file 'profiles/exprofile/exprofile.info'
--- profiles/exprofile/exprofile.info 2010-04-09 13:48:36 +0000
+++ profiles/exprofile/exprofile.info 2010-04-18 18:47:10 +0000
@@ -22,6 +22,7 @@ dependencies[] = devel_generate
 dependencies[] = coder
 dependencies[] = coder_review
 dependencies[] = coder_tough_love
+dependencies[] = globalredirect
 dependencies[] = simpletest
 dependencies[] = user_reference
 dependencies[] = scheduler

=== modified file 'sites/all/modules/contrib/globalredirect-HEAD/globalredirect.module'
--- sites/all/modules/contrib/globalredirect-HEAD/globalredirect.module 2010-03-19 13:00:27 +0000
+++ sites/all/modules/contrib/globalredirect-HEAD/globalredirect.module 2010-04-19 00:33:20 +0000
@@ -81,6 +81,22 @@ function globalredirect_init() {
       isset($_REQUEST['q']) &&
       empty($_POST)) {
 
+    // Don't redirect if a module has altered the path via
+    // hook_url_inbound_alter().
+    // @todo: for now just run the hook again to see if it gets altered or not.
+    // it would be better to find out if it's been altered or aliased without
+    // running the hook again. But short of setting a static or global not
+    // sure what could be done, given both this and the outbound alter hook
+    // run after path aliasing has already occurred.
+    $path = $original_path = $_REQUEST['q'];
+    foreach (array_reverse(module_implements('url_inbound_alter')) as $module) {
+      $function = $module . '_url_inbound_alter';
+      $function($path, $original_path, $language->language);
+    }
+    if ($path != $original_path) {
+      return;
+    }
+
     // If menu checking is enabled, do the check. Feature disabled by default.
     if ($menu_check == GLOBALREDIRECT_MENU_CHECK_ENABLED) {
       // Check the access on the current path, return FALSE if access not