- Patch #29030 by Goba, chx, Jose, et al: reworked the URL rewrite hook so URLs can be rewritten dynamically.

1 files changed, 6 insertions, 8 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 2a098aa7c..28d975e61 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -134,16 +134,14 @@ function drupal_clear_path_cache() {
  * 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;
+  $result = $path;
+  if ($src = drupal_lookup_path('source', $path)) {
+    $result = $src;
   }
-  elseif (function_exists('conf_url_rewrite')) {
-    return conf_url_rewrite($path, 'incoming');
-  }
-  else {
-    return $path;
+  if (function_exists('custom_url_rewrite')) {
+    $result = custom_url_rewrite('source', $result, $path);
   }
+  return $result;
 }
 
 /**