? my.patch Index: includes/token.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/token.inc,v retrieving revision 1.10 diff -u -p -r1.10 token.inc --- includes/token.inc 18 Oct 2010 01:13:07 -0000 1.10 +++ includes/token.inc 21 Jan 2011 15:29:39 -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\]:]*):([^\]]*)\]/', $text, $matches); $types = $matches[1]; $tokens = $matches[2];