Index: token.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token.module,v
retrieving revision 1.7.4.33
diff -u -p -r1.7.4.33 token.module
--- token.module	10 Aug 2010 03:33:32 -0000	1.7.4.33
+++ token.module	15 Sep 2010 22:10:40 -0000
@@ -306,12 +306,8 @@ function token_get_values($type = 'globa
   token_include();
 
   $id = _token_get_id($type, $object);
-  if ($id && isset($tokens[$type][$id])) {
-    $tmp_tokens = $tokens[$type][$id];
-  }
-  else {
-    $tmp_tokens = module_invoke_all('token_values', $type, $object, $options);
-    $tokens[$type][$id] = $tmp_tokens;
+  if (!$id || !isset($tokens[$type][$id])) {
+    $tokens[$type][$id] = module_invoke_all('token_values', $type, $object, $options);
   }
 
   // Special-case global tokens, as we always want to be able to process