Index: token_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_node.inc,v
retrieving revision 1.5.4.11
diff -u -r1.5.4.11 token_node.inc
--- token_node.inc	23 Jul 2008 15:46:41 -0000	1.5.4.11
+++ token_node.inc	25 Nov 2008 10:58:30 -0000
@@ -110,17 +110,21 @@
             // pull it out of the db here.
             if (!isset($term->name) || !isset($term->tid)) {
               $vid = db_result(db_query_range("SELECT t.vid FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.nid = %d ORDER BY v.weight, t.weight, t.name", $object->nid, 0, 1));
-              if (!$vid) {
-                continue;
+              if ($vid) {
+                $term = db_fetch_object(db_query_range("SELECT t.tid, t.name FROM {term_data} t INNER JOIN {term_node} r ON r.tid = t.tid WHERE t.vid = %d AND r.nid = %d ORDER BY weight", $vid, $object->nid, 0, 1));
+                $term->vid = $vid;
               }
-              $term = db_fetch_object(db_query_range("SELECT t.tid, t.name FROM {term_data} t INNER JOIN {term_node} r ON r.tid = t.tid WHERE t.vid = %d AND r.nid = %d ORDER BY weight", $vid, $object->nid, 0, 1));
-              $term->vid = $vid;
             }
 
             // 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)) {
+              if (is_array($original_term)) {
+                $tid = array_shift($original_term);
+              }
+              else {
+                $tid = $original_term;
+              }
               if (is_numeric($tid)) {
                 $term = taxonomy_get_term($tid);
               }