Index: modules/i18n/i18n.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18n/i18n.module,v
retrieving revision 1.38
diff -u -r1.38 i18n.module
--- modules/i18n/i18n.module	11 Jan 2007 23:46:10 -0000	1.38
+++ modules/i18n/i18n.module	9 Mar 2007 21:55:46 -0000
@@ -646,15 +646,21 @@
 }  
 
 /**
- * Rewrites path with current language
+ * Rewrites path with current language or returns normal path.
+ *
+ * custom_url_rewrite() is called in two places in Drupal core:
+ * in drupal_get_path_alias() to enable aliasing, and in 
+ * drupal_get_normal_path() to return the normal path for a
+ * potentially aliased path. We respond here to both.
  */
 function i18n_url_rewrite($type, $path, $original){
   if ($type == 'alias' && !i18n_get_lang_prefix($path) ){
     return $path ? i18n_get_lang() . '/'. $path : i18n_get_lang();
-  } else {
-    return $path;
-  } 
-} 
+  }
+  elseif ($type == 'source'){
+    return i18n_get_normal_path($path);
+  }
+}
 
 /**
  * Implementation of hook_db_rewrite_sql()