Index: includes/token.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/token.inc,v
retrieving revision 1.8
diff -u -p -r1.8 token.inc
--- includes/token.inc	25 Jan 2010 10:38:34 -0000	1.8
+++ includes/token.inc	4 Mar 2010 23:36:29 -0000
@@ -103,7 +103,7 @@ function token_replace($text, array $dat
 function token_scan($text) {
   // Matches tokens with the following pattern: [$type:$token]
   // $type and $token may not contain white spaces.
-  preg_match_all('/\[([^\s\]:]*):([^\s\]]*)\]/', $text, $matches);
+  preg_match_all('/\[([^\s\[\]:]*):([^\s\]]*)\]/', $text, $matches);
 
   $types = $matches[1];
   $tokens = $matches[2];