From b7a993639be0655542f082740f34ca7e972922db Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 16 Jan 2006 08:45:30 +0000
Subject: - Patch #9477 by Neil and Richard: fixed inconsistent behavior of
 user-specified paths.

---
 includes/menu.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/menu.inc b/includes/menu.inc
index fef280653..35e02717d 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1003,7 +1003,9 @@ function _menu_build() {
     $result = db_query('SELECT * FROM {menu} ORDER BY mid ASC');
     while ($item = db_fetch_object($result)) {
       // Handle URL aliases if entered in menu administration.
-      $item->path = drupal_get_normal_path($item->path);
+      if (!isset($_menu['path index'][$item->path])) {
+        $item->path = drupal_get_normal_path($item->path);
+      }
       if (isset($_menu['path index'][$item->path])) {
         // The path is already declared.
         $old_mid = $_menu['path index'][$item->path];
-- 
cgit v1.2.3