Commit b7a99363 authored by Dries's avatar Dries
Browse files

- Patch #9477 by Neil and Richard: fixed inconsistent behavior of user-specified paths.

parent 54b8ad65
...@@ -1003,7 +1003,9 @@ function _menu_build() { ...@@ -1003,7 +1003,9 @@ function _menu_build() {
$result = db_query('SELECT * FROM {menu} ORDER BY mid ASC'); $result = db_query('SELECT * FROM {menu} ORDER BY mid ASC');
while ($item = db_fetch_object($result)) { while ($item = db_fetch_object($result)) {
// Handle URL aliases if entered in menu administration. // 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])) { if (isset($_menu['path index'][$item->path])) {
// The path is already declared. // The path is already declared.
$old_mid = $_menu['path index'][$item->path]; $old_mid = $_menu['path index'][$item->path];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment