Binary files drupal6/.DS_Store and drupal6.3/.DS_Store differ
diff -ru drupal6/includes/menu.inc drupal6.3/includes/menu.inc
--- drupal6/includes/menu.inc	2008-07-09 23:23:50.000000000 +0800
+++ drupal6.3/includes/menu.inc	2008-07-19 15:58:10.000000000 +0800
@@ -1047,6 +1047,10 @@
   $remnant = NULL;
   $tree = array();
   while ($item = db_fetch_array($result)) {
+  	if (!function_exists('drupal_get_normal_path')) {
+  	  require_once './includes/path.inc';
+    }
+  	$item['link_path'] = drupal_get_normal_path($item['link_path']);
     // We need to determine if we're on the path to root so we can later build
     // the correct active trail and breadcrumb.
     $item['in_active_trail'] = in_array($item['mlid'], $parents);
@@ -1949,6 +1953,10 @@
     else {
       // Find the router path which will serve this path.
       $item['parts'] = explode('/', $item['link_path'], MENU_MAX_PARTS);
+      if (!function_exists('drupal_get_normal_path')) {
+  	    require_once './includes/path.inc';
+      }
+      $link_path = drupal_get_normal_path($item['link_path']);
       $item['router_path'] = _menu_find_router_path($menu, $item['link_path']);
     }
   }
@@ -2432,7 +2440,10 @@
 function menu_valid_path($form_item) {
   global $menu_admin;
   $item = array();
-  $path = $form_item['link_path'];
+  if (!function_exists('drupal_get_normal_path')) {
+  	require_once './includes/path.inc';
+  }
+  $path = drupal_get_normal_path($form_item['link_path']);
   // We indicate that a menu administrator is running the menu access check.
   $menu_admin = TRUE;
   if ($path == '<front>' || menu_path_is_external($path)) {
diff -ru drupal6/modules/menu/menu.admin.inc drupal6.3/modules/menu/menu.admin.inc
--- drupal6/modules/menu/menu.admin.inc	2008-02-11 23:12:54.000000000 +0800
+++ drupal6.3/modules/menu/menu.admin.inc	2008-07-19 15:59:02.000000000 +0800
@@ -333,11 +333,6 @@
  */
 function menu_edit_item_validate($form, &$form_state) {
   $item = &$form_state['values']['menu'];
-  $normal_path = drupal_get_normal_path($item['link_path']);
-  if ($item['link_path'] != $normal_path) {
-    drupal_set_message(t('The menu system stores system paths only, but will use the URL alias for display. %link_path has been stored as %normal_path', array('%link_path' => $item['link_path'], '%normal_path' => $normal_path)));
-    $item['link_path'] = $normal_path;
-  }
   if (!menu_path_is_external($item['link_path'])) {
     $parsed_link = parse_url($item['link_path']);
     if (isset($parsed_link['query'])) {