Index: menutrails.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/menutrails/menutrails.module,v
retrieving revision 1.4.2.11
diff -u -p -r1.4.2.11 menutrails.module
--- menutrails.module	2 Feb 2009 15:50:15 -0000	1.4.2.11
+++ menutrails.module	2 Feb 2009 18:20:59 -0000
@@ -346,15 +346,13 @@ function menutrails_token_values($type, 
       foreach ($trail_raw as $title) {
         $trail[] = check_plain($title);
       }
-      $tokens['menu-trail-parents-raw'] = implode('/', $trail_raw);
-      $tokens['menu-trail-parents'] = implode('/', $trail);
+      $tokens['menu-trail-parents-path-raw'] = implode('/', $trail_raw);
+      $tokens['menu-trail-parents-path'] = implode('/', $trail);
     }
     // Return NULL in case there is no trail.
-    if (!isset($tokens['menu-trail-parents-raw'])) {
-      $tokens['menu-trail-parents-raw'] = NULL;
-    }
-    if (!isset($tokens['menu-trail-parents'])) {
-      $tokens['menu-trail-parents'] = NULL;
+    else {
+      $tokens['menu-trail-parents-path-raw'] = NULL;
+      $tokens['menu-trail-parents-path'] = NULL;
     }
     return $tokens;
   }
@@ -362,8 +360,8 @@ function menutrails_token_values($type, 
 
 function menutrails_token_list($type = 'all') {
   if ($type == 'node' || $type == 'all') {
-    $tokens['menutrails']['menu-trail-parents-raw'] = t("The menu trail leading up to but NOT including the node -- RAW");
-    $tokens['menutrails']['menu-trail-parents'] = t("The menu trail leading up to but NOT including the node");
+    $tokens['menutrails']['menu-trail-parents-path-raw'] = t("The menu trail leading up to but NOT including the node -- RAW");
+    $tokens['menutrails']['menu-trail-parents-path'] = t("The menu trail leading up to but NOT including the node");
     return $tokens;
   }
 }