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:40:47 -0000
@@ -408,6 +408,10 @@ function token_get_invalid_tokens($type,
   $token_info = token_get_info();
   $invalid_tokens = array();
 
+  // Normalize the token type (e.g. if $type is 'current-user' we need to
+  // convert it to the 'user' type).
+  $type = $token_info['types'][$type]['type'];
+
   foreach ($tokens as $token => $full_token) {
     // Split token up if it has chains.
     $parts = explode(':', $token, 2);
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:40:47 -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]',