Index: token.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token.module,v
retrieving revision 1.54
diff -u -p -r1.54 token.module
--- token.module	2 Dec 2010 17:21:50 -0000	1.54
+++ token.module	7 Dec 2010 18:24:20 -0000
@@ -386,7 +386,8 @@ function token_get_invalid_tokens_by_con
     }
     else {
       // Check each individual token for validity.
-      $invalid_tokens = array_merge($invalid_tokens, token_get_invalid_tokens($type, $tokens));
+      $type_info = token_get_info($type);
+      $invalid_tokens = array_merge($invalid_tokens, token_get_invalid_tokens($type_info['type'], $tokens));
     }
   }
 
Index: token.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token.test,v
retrieving revision 1.28
diff -u -p -r1.28 token.test
--- token.test	21 Nov 2010 23:48:00 -0000	1.28
+++ token.test	7 Dec 2010 18:24:20 -0000
@@ -112,6 +112,8 @@ class TokenUnitTestCase extends TokenTes
         '[node:created:custom:mm-YYYY]',
         '[site:name]',
         '[site:slogan]',
+        '[current-date:short]',
+        '[current-user:name]',
       ),
       'invalid tokens' => array(
         '[node:title:invalid]',