summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-01-16 08:45:30 +0000
committerDries Buytaert <dries@buytaert.net>2006-01-16 08:45:30 +0000
commitb7a993639be0655542f082740f34ca7e972922db (patch)
treee8a6d0784189e51ef6a71d12848d19f00b34e5b0
parent54b8ad6550c5da194f06831cb52a4a05315392fa (diff)
downloadbrdo-b7a993639be0655542f082740f34ca7e972922db.tar.gz
brdo-b7a993639be0655542f082740f34ca7e972922db.tar.bz2
- Patch #9477 by Neil and Richard: fixed inconsistent behavior of user-specified paths.
-rw-r--r--includes/menu.inc4
1 files changed, 3 insertions, 1 deletions
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];