Index: taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.330.2.15
diff -u -p -r1.330.2.15 taxonomy.module
--- taxonomy.module	20 Dec 2007 07:48:11 -0000	1.330.2.15
+++ taxonomy.module	27 May 2008 22:27:46 -0000
@@ -776,8 +776,11 @@ function taxonomy_node_get_terms_by_voca
 /**
  * Find all terms associated with the given node, ordered by vocabulary and term weight.
  */
-function taxonomy_node_get_terms($nid, $key = 'tid') {
+function taxonomy_node_get_terms($nid, $key = 'tid', $reset = FALSE) {
   static $terms;
+  if($reset && is_array($terms) && isset($terms[$nid])) {
+    unset($terms[$nid]);
+  }
 
   if (!isset($terms[$nid][$key])) {
     $result = db_query(db_rewrite_sql('SELECT t.* 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', 't', 'tid'), $nid);
@@ -878,6 +881,9 @@ function taxonomy_node_save($nid, $terms
       }
     }
   }
+
+  // Reset terms for next node load...
+  taxonomy_node_get_terms($nid, 'tid', TRUE);
 }
 
 /**