Index: bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.66
diff -u -r1.66 bootstrap.inc
--- bootstrap.inc	8 Sep 2005 19:17:34 -0000	1.66
+++ bootstrap.inc	13 Sep 2005 23:31:39 -0000
@@ -530,15 +530,15 @@
  */
 function drupal_get_path_alias($path) {
   if ($alias = drupal_lookup_path('source', $path)) {
-    return $alias;
+    $path = $alias;
   }
-  elseif (function_exists('conf_url_rewrite')) {
-    return conf_url_rewrite($path, 'outgoing');
-  }
-  else {
-    // No alias found. Return the normal path.
-    return $path;
+  
+  if (function_exists('conf_url_rewrite')) {
+    $path = conf_url_rewrite($path, 'outgoing');
   }
+  
+  return $path;
+
 }
 
 /**
Index: common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.476
diff -u -r1.476 common.inc
--- common.inc	31 Aug 2005 18:37:30 -0000	1.476
+++ common.inc	13 Sep 2005 23:31:44 -0000
@@ -134,16 +134,15 @@
  * Given a path alias, return the internal path it represents.
  */
 function drupal_get_normal_path($path) {
-  //drupal_get_path_alias($path);
   if ($src = drupal_lookup_path('alias', $path)) {
-    return $src;
+    $path = $src;
   }
-  elseif (function_exists('conf_url_rewrite')) {
-    return conf_url_rewrite($path, 'incoming');
-  }
-  else {
-    return $path;
+
+  if (function_exists('conf_url_rewrite')) {
+    $path = conf_url_rewrite($path, 'incoming');
   }
+
+  return $path;
 }
 
 /**