Index: token_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_node.inc,v
retrieving revision 1.3.2.19
diff -u -p -r1.3.2.19 token_node.inc
--- token_node.inc	21 Oct 2007 18:18:43 -0000	1.3.2.19
+++ token_node.inc	22 Oct 2007 01:27:40 -0000
@@ -60,6 +60,7 @@ function node_token_values($type, $objec
         array_unshift($trail, check_plain($_menu['visible'][$mid]['title']));
         $mid = $_menu['visible'][$mid]['pid'];
       }
+      
 
       // One more time, unfiltered
       $mid = $original_mid;
@@ -72,10 +73,12 @@ function node_token_values($type, $objec
       if (isset($trail)) {
         $values['menupath']     = implode('/', $trail);
         $values['menupath-raw'] = implode('/', $trail_raw);
-        $values['menu']         = array_shift($trail);
+        $values['menu']         = check_plain($_menu['visible'][$mid]['title']);
+        $values['menu-raw']     = $_menu['visible'][$mid]['title'];
       }
       else {
         $values['menu']         = '';
+        $values['menu-raw']     = '';
         $values['menupath']     = '';
         $values['menupath-raw'] = '';
       }
@@ -175,6 +178,7 @@ function node_token_list($type = 'all') 
     $tokens['node']['mod-????']       = t('All tokens for node creation dates can also be used with with the "mod-" prefix; doing so will use the modification date rather than the creation date.');
 
     $tokens['node']['menu']           = t("The name of the menu the node belongs to.");
+    $tokens['node']['menu-raw']       = t("The name of the menu the node belongs to. WARNING - raw user input.");
     $tokens['node']['menupath']       = t("The menu path (as reflected in the breadcrumb), not including Home or [menu]. Separated by /.");
     $tokens['node']['menupath-raw']   = t("The unfiltered menu path (as reflected in the breadcrumb), not including Home or [menu]. Separated by /. WARNING - raw user input.");
     return $tokens;