--- taxonomy/taxonomy.module	Fri Nov 05 15:01:41 2010
+++ taxonomy/taxonomy.module	Fri Aug 06 12:10:58 2010
@@ -626,17 +626,8 @@
 /**
  * Find all terms associated with the given node, ordered by vocabulary and term weight.
  */
-define('RESET_NONE',0);
-define('RESET_THIS',1);
-define('RESET_ALL',2);
-function taxonomy_node_get_terms($node, $key = 'tid', $reset = RESET_NONE) {
+function taxonomy_node_get_terms($node, $key = 'tid') {
   static $terms;
-  
-  if($reset == RESET_ALL) {
-    $terms = array();
-  } elseif($reset == RESET_THIS && is_array($terms) && isset($terms[$node->vid])) {
-    unset($terms[$node->vid]);
-  }
 
   if (!isset($terms[$node->vid][$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.vid = %d ORDER BY v.weight, t.weight, t.name', 't', 'tid'), $node->vid);
@@ -708,8 +699,6 @@
         }
       }
     }
-    // Reset terms for next node load...
-    taxonomy_node_get_terms($node->nid, 'tid', RESET_THIS);
   }
 
   if (is_array($terms)) {