--- token_custom.module.orig 2009-01-17 18:34:32.000000000 -0200 +++ token_custom.module 2009-01-17 18:35:56.000000000 -0200 @@ -124,7 +124,9 @@ function token_custom_token_values($type case 'node': case 'comment': case 'user': - $tokens[$row->id] = _token_eval($row->php, $row->type, $object); + if ($type == $row->type) { + $tokens[$row->id] = _token_eval($row->php, $row->type, $object); + } break; default: $tokens[$row->id] = _token_eval($row->php, $row->type);