Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.114
diff -u -r1.114 taxonomy.module
--- modules/taxonomy.module     4 May 2004 01:44:30 -0000       1.114
+++ modules/taxonomy.module     11 May 2004 01:13:58 -0000
@@ -377,7 +377,7 @@
   static $terms;

   if (!isset($terms[$nid])) {
-    $result = db_query("SELECT t.* FROM {term_data} t, {term_node} r WHERE r.tid = t.tid AND r.nid = %d ORDER BY weight, name", $nid);
+    $result = db_query("SELECT t.* FROM {term_data} t, {term_node} r, {vocabulary} v WHERE r.tid = t.tid AND r.nid = %d AND t.vid = v.vid ORDER BY t.weight, v.weight, t.name", $nid);
     $terms[$nid] = array();
     while ($term = db_fetch_object($result)) {
       $terms[$nid][$term->$key] = $term;