From 100f9332f1b3c37d91a388ae4cf080482dbaea2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=CC=81bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Wed, 1 Feb 2012 15:43:44 +0100
Subject: [PATCH] Issue #879270 by Ben Coleman: query in
 taxonomy_node_get_terms() needs the v.weight field added to the SELECT
 because it was already present in the ORDER BY; improved PostgreSQL
 compatibility

---
 modules/taxonomy/taxonomy.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index fb55d3349eb..168e289c129 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -637,7 +637,7 @@ function taxonomy_node_get_terms($node, $key = 'tid', $reset = FALSE) {
   }
 
   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 t.*,v.weight AS v_weight_unused 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);
     $terms[$node->vid][$key] = array();
     while ($term = db_fetch_object($result)) {
       $terms[$node->vid][$key][$term->$key] = $term;