Index: token.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/token.inc,v
retrieving revision 1.9
diff -u -p -r1.9 token.inc
--- token.inc	12 Mar 2010 14:33:02 -0000	1.9
+++ token.inc	22 Aug 2010 10:15:35 -0000
@@ -106,7 +106,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];