Index: common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.299
diff -u -r1.299 common.inc
--- common.inc	2 Jan 2004 12:15:37 -0000	1.299
+++ common.inc	2 Jan 2004 19:49:55 -0000
@@ -801,20 +801,26 @@
  * Given an old url, return the alias.
  */
 function drupal_get_path_alias($path) {
-  $map = drupal_get_path_map();
-
-  if ($map) {
-    return array_search($path, $map);
+  if (($map = conf_get_path_map()) && ($newpath = array_search($path, $map))) {
+    return $newpath;
+  }
+  if (function_exists("conf_url_rewrite")) {
+    return conf_url_rewrite($path, 'outgoing');
   }
+  return $path;
 }
 
 /**
  * Given an alias, return the default url.
  */
 function drupal_get_normal_path($path) {
-  $map = drupal_get_path_map();
-
-  return $map[$path] ? $map[$path] : $path;
+  if (($map = conf_get_path_map()) && isset($map[$path])) {
+    return $map[$path];
+  }
+  elseif(function_exists("conf_url_rewrite")) {
+    return conf_url_rewrite($path, 'incoming');
+  }
+  return $path;
 }
 
 function url($url = NULL, $query = NULL, $fragment = NULL) {