--- token_cck.inc	2007-10-16 10:37:59.000000000 -0400
+++ token_cck.inc.new	2008-02-15 12:19:58.000000000 -0500
@@ -12,7 +12,7 @@ function content_token_values($type, $ob
     $field_types = _content_field_types();
 
     foreach (content_fields() as $field) {
-      
+
       $items = $node->$field['field_name'];
       if (!empty($items)) {
         $function = $field_types[$field['type']]['module'] . '_token_values';
@@ -59,7 +59,8 @@ if (module_exists('nodereference')) {
 
       $tokens['node reference']['nid']   = t("Referenced node ID.");
       $tokens['node reference']['title'] = t("Referenced node title.");
-      $tokens['node reference']['link']  = t("Formatted html link to the node.");
+      $tokens['node reference']['link']  = t("Formatted html link to the referenced node.");
+      $tokens['node reference']['path']  = t("Path alias to the referenced node.");
 
       return $tokens;
     }
@@ -72,6 +73,7 @@ if (module_exists('nodereference')) {
       $tokens['nid']   = $item['nid'];
       $tokens['title'] = strip_tags($item['view']);
       $tokens['link']  = $item['view'];
+      $tokens['path'] = preg_match('@\<a href\="([^"]+)"\>@i', $item['view'], $matches) ? $matches[1] : '';
 
       return $tokens;
     }
@@ -137,6 +139,7 @@ if (module_exists('userreference')) {
       $tokens['user reference']['uid']   = t("Referenced user ID");
       $tokens['user reference']['name']  = t("Referenced user name");
       $tokens['user reference']['link']  = t("Formatted html link to referenced user");
+      $tokens['user reference']['path']  = t("Path alias to the referenced user.");
 
       return $tokens;
     }
@@ -149,6 +152,7 @@ if (module_exists('userreference')) {
       $tokens['uid']   = $item['uid'];
       $tokens['name']  = strip_tags($item['view']);
       $tokens['link']  = $item['view'];
+      $tokens['path'] = preg_match('@\<a href\="([^"]+)"\>@i', $item['view'], $matches) ? $matches[1] : '';
 
       return $tokens;
     }
@@ -253,7 +257,7 @@ if (module_exists('date')) {
     if ($type == 'field') {
       include_once(drupal_get_path('module', 'date') .'/date.inc');
       $item = $object[0];
-      
+
       $item['value'] = trim($item['value']);
       $item_format = (is_numeric($item['value']) ? DATE_UNIX : DATE_ISO);
       $date = date_make_date($item['value'], 'none', 'local', $item_format);
@@ -275,11 +279,11 @@ if (module_exists('date')) {
       $tokens['d']              = date_show_date($date, 'j');
 
       if (!empty($item['value2'])) {
-      
+
         $item['value2'] = trim($item['value2']);
         $item_format = (is_numeric($item['value2']) ? DATE_UNIX : DATE_ISO);
         $date = date_make_date($item['value2'], 'none', 'local', $item_format);
-      
+
         $tokens['to-value']          = $item['value2'];
         $tokens['to-view']           = $item['view2'];
         $tokens['to-timestamp']      = $date->local->timestamp;