Index: includes/content.token.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/includes/Attic/content.token.inc,v
retrieving revision 1.5.2.8
diff -u -p -r1.5.2.8 content.token.inc
--- includes/content.token.inc	5 Dec 2008 14:59:22 -0000	1.5.2.8
+++ includes/content.token.inc	5 Oct 2010 21:50:13 -0000
@@ -21,7 +21,7 @@ function token_content_build_modes() {
 }
 
 // Two helper functions that generate appropriate tokens for CCK-added fields.
-function content_token_values($type, $object = NULL) {
+function content_token_values($type, $object = NULL, $options = array()) {
   $tokens = array();
   if ($type == 'node') {
     $node = $object;
@@ -40,7 +40,7 @@ function content_token_values($type, $ob
         $items = $node->{$field['field_name']};
         $function = $field_types[$field['type']]['module'] . '_token_values';
         if (!empty($items) && function_exists($function)) {
-          $token_values = $function('field', $items);
+          $token_values = $function('field', $items, $options);
           foreach ($token_values as $token => $value) {
             $tokens[$field['field_name'] .'-'. $token] = $value;
           }
@@ -89,7 +89,7 @@ if (module_exists('nodereference')) {
     }
   }
 
-  function nodereference_token_values($type, $object = NULL) {
+  function nodereference_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -118,7 +118,7 @@ if (module_exists('number')) {
     }
   }
 
-  function number_token_values($type, $object = NULL) {
+  function number_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -142,7 +142,7 @@ if (module_exists('text')) {
     }
   }
 
-  function text_token_values($type, $object = NULL) {
+  function text_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -168,7 +168,7 @@ if (module_exists('userreference')) {
     }
   }
 
-  function userreference_token_values($type, $object = NULL) {
+  function userreference_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];