--- modules/taxonomy.module	2006-05-24 20:21:40.000000000 +0200
+++ modules/taxonomy.module	2006-05-25 16:36:27.000000000 +0200
@@ -686,7 +686,7 @@ function taxonomy_node_get_terms($nid, $
   static $terms;
 
   if (!isset($terms[$nid])) {
-    $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);
+    $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, v.vid, t.weight, t.name', 't', 'tid'), $nid);
     $terms[$nid] = array();
     while ($term = db_fetch_object($result)) {
       $terms[$nid][$term->$key] = $term;