summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-11-23 08:27:55 +0000
committerDries Buytaert <dries@buytaert.net>2005-11-23 08:27:55 +0000
commitd9dc551612f1b31abd9930f318d5a04caf92f848 (patch)
tree1efb16d75e681664a4e022d9e233d4c0b00493c3
parentbd2d91807e815a5ac29915788a454ec5f2783d17 (diff)
downloadbrdo-d9dc551612f1b31abd9930f318d5a04caf92f848.tar.gz
brdo-d9dc551612f1b31abd9930f318d5a04caf92f848.tar.bz2
- Patch #29151 by fgm: simplified SQL query in taxonomy_node_form().
-rw-r--r--modules/taxonomy.module2
-rw-r--r--modules/taxonomy/taxonomy.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index bb4ada828..701645957 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -513,7 +513,7 @@ function taxonomy_node_form($node) {
$terms = $node->taxonomy;
}
- $c = db_query(db_rewrite_sql("SELECT v.*, n.type FROM {vocabulary} v INNER JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", 'v', 'vid'), $node->type);
+ $c = db_query(db_rewrite_sql("SELECT v.* FROM {vocabulary} v INNER JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", 'v', 'vid'), $node->type);
while ($vocabulary = db_fetch_object($c)) {
if ($vocabulary->tags) {
$typed_terms = array();
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index bb4ada828..701645957 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -513,7 +513,7 @@ function taxonomy_node_form($node) {
$terms = $node->taxonomy;
}
- $c = db_query(db_rewrite_sql("SELECT v.*, n.type FROM {vocabulary} v INNER JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", 'v', 'vid'), $node->type);
+ $c = db_query(db_rewrite_sql("SELECT v.* FROM {vocabulary} v INNER JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", 'v', 'vid'), $node->type);
while ($vocabulary = db_fetch_object($c)) {
if ($vocabulary->tags) {
$typed_terms = array();