--- D:\src\drupal\5.0\modules\token\token_node.inc	Sun Oct 28 16:10:42 2007 UTC
+++ D:\src\htdocs\bt\mwt\sites\all\modules\token\token_node.inc	Fri Jan 4 12:05:15 2008 UTC
@@ -100,8 +100,8 @@
 
             // Ok, if we still don't have a term name maybe this is a pre-taxonomy submit node
             // So if it's a number we can get data from it
-            if(!isset($term->name) && is_array($original_term)) {
-              $tid = array_shift($original_term);
+            if(!isset($term->name)) {
+              $tid = (is_array($original_term)) ? array_shift($original_term) : $original_term;
               if (is_numeric($tid)) {
                 $term = taxonomy_get_term($tid);
               }