? nodereference_196518.patch
Index: modules/nodereference/nodereference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/nodereference/Attic/nodereference.module,v
retrieving revision 1.138.2.55
diff -u -p -r1.138.2.55 nodereference.module
--- modules/nodereference/nodereference.module	2 Jun 2009 12:24:04 -0000	1.138.2.55
+++ modules/nodereference/nodereference.module	2 Jun 2009 21:38:18 -0000
@@ -124,6 +124,19 @@ function nodereference_field_settings($o
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
           );
+          // Add token list for view argument in advance setting.
+          if (module_exists('token')) {
+            $form['advanced']['token_help'] = array(
+              '#title' => t('View argument token replacement patterns'),
+              '#type' => 'fieldset',
+              '#collapsible' => TRUE,
+              '#collapsed' => TRUE,
+              '#description' => t('Prefer raw-text replacements for text to avoid problems with HTML entities!'),
+            );
+            $form['advanced']['token_help']['help'] = array(
+              '#value' => theme('token_help', 'node'),
+            );
+          }
         }
         else {
           $form['advanced']['no_view_help'] = array(
@@ -819,8 +832,16 @@ function _nodereference_potential_refere
 
     // Get arguments for the view.
     if (!empty($field['advanced_view_args'])) {
-      // TODO: Support Tokens using token.module ?
       $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
+      // Support for Tokens using token.module.
+      if (module_exists('token')) {
+        // Load the node from the menu system.
+        $node = menu_get_object('node', 1);
+        if (!empty($node->nid)) {
+          // Replace tokens using node information.
+          $view_args = token_replace($view_args, 'node', $node);
+        }
+      }
     }
     else {
       $view_args = array();
Index: modules/userreference/userreference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/userreference/Attic/userreference.module,v
retrieving revision 1.106.2.43
diff -u -p -r1.106.2.43 userreference.module
--- modules/userreference/userreference.module	2 Jun 2009 12:24:04 -0000	1.106.2.43
+++ modules/userreference/userreference.module	2 Jun 2009 21:38:19 -0000
@@ -121,6 +121,19 @@ function userreference_field_settings($o
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
           );
+          // Add token list for view argument in advance setting.
+          if (module_exists('token')) {
+            $form['advanced']['token_help'] = array(
+              '#title' => t('View argument token replacement patterns'),
+              '#type' => 'fieldset',
+              '#collapsible' => TRUE,
+              '#collapsed' => TRUE,
+              '#description' => t('Prefer raw-text replacements for text to avoid problems with HTML entities!'),
+            );
+            $form['advanced']['token_help']['help'] = array(
+              '#value' => theme('token_help', 'node'),
+            );
+          }
         }
         else {
           $form['advanced']['no_view_help'] = array(
@@ -730,8 +743,16 @@ function _userreference_potential_refere
 
     // Get arguments for the view.
     if (!empty($field['advanced_view_args'])) {
-      // TODO: Support Tokens using token.module ?
       $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
+      // Support for Tokens using token.module.
+      if (module_exists('token')) {
+        // Load the node from the menu system.
+        $node = menu_get_object('node', 1);
+        if (!empty($node->nid)) {
+          // Replace tokens using node information.
+          $view_args = token_replace($view_args, 'node', $node);
+        }
+      }
     }
     else {
       $view_args = array();