summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2009-01-27 20:13:27 (GMT)
committer Earl Miles2009-01-27 20:13:27 (GMT)
commit3f08d56a2c256890d457b04a9bedde4d5cca82f5 (patch)
tree43f47f8a4d3e1c8e9182cb943098129a587bd365
parent6a073d51973c4217cef2b10330d5e2f1f35b9b0e (diff)
#351745: Exposed taxonomy term autocomplete filter failed if term existed in multiple vocabularies.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--modules/taxonomy/views_handler_filter_term_node_tid.inc5
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 22a8959..f9c2ddd 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -87,6 +87,7 @@ Views 2.3
o #353090 by eaton: RSS feeds were not using all of the Drupal hooks to ensure full compatibility with core feeds.
o #293832 by drewish: Allow menu items to have administrative description.
o #345528: Mini-pager generated invalid HTML with empty li tags.
+ o #351745: Exposed taxonomy term autocomplete filter failed if term existed in multiple vocabularies.
Other changes:
o #288801 by drewish and eaton: Aggregator item support! Make views of feeds!
diff --git a/modules/taxonomy/views_handler_filter_term_node_tid.inc b/modules/taxonomy/views_handler_filter_term_node_tid.inc
index aaa5d06..b1da404 100644
--- a/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -245,7 +245,10 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
return;
}
- $result = db_query("SELECT * FROM {term_data} WHERE name IN (" . implode(', ', $placeholders) . ")", $args);
+ // add the taxonomy vid to the argument list.
+ $args[] = $this->options['vid'];
+
+ $result = db_query("SELECT * FROM {term_data} WHERE name IN (" . implode(', ', $placeholders) . ") AND vid = %d", $args);
while ($term = db_fetch_object($result)) {
unset($missing[strtolower($term->name)]);
$tids[] = $term->tid;