--- C:/Dokumente und Einstellungen/alexander.schroeder/Desktop/speedup/drupal-6.8/modules/taxonomy/taxonomy.module	Wed Sep 17 13:55:37 2008
+++ C:/Dokumente und Einstellungen/alexander.schroeder/Desktop/speedup/drupal-6.8/modules/taxonomy/Kopie von taxonomy.module	Fri Dec 19 10:31:48 2008
@@ -615,7 +615,7 @@
   static $terms;
 
   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);
+	$result = db_query(db_rewrite_sql('SELECT t2.* FROM (SELECT t.tid as tid 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) as t3 INNER JOIN term_data t2 WHERE t2.tid=t3.tid'), $nid);
     $terms[$node->vid][$key] = array();
     while ($term = db_fetch_object($result)) {
       $terms[$node->vid][$key][$term->$key] = $term;
@@ -789,7 +789,7 @@
     $result = db_query(db_rewrite_sql('SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON h.tid = t.tid WHERE t.vid = %d AND h.parent = %d ORDER BY weight, name', 't', 'tid'), $vid, $tid);
   }
   else {
-    $result = db_query(db_rewrite_sql('SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON h.tid = t.tid WHERE parent = %d ORDER BY weight, name', 't', 'tid'), $tid);
+    $result = db_query(db_rewrite_sql('SELECT t2.* FROM (SELECT t.tid as tid FROM term_data t INNER JOIN term_hierarchy h ON h.tid = t.tid WHERE parent = %d ORDER BY weight, name) as t3 INNER JOIN term_data t2 WHERE t2.tid=t3.tid'), $tid);
   }
   $children = array();
   while ($term = db_fetch_object($result)) {