summaryrefslogtreecommitdiff
path: root/modules/taxonomy/taxonomy.pages.inc
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-07-25 11:48:52 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2011-07-25 11:48:52 -0700
commitbdc2373eabb8729931032c007600ca69ab1c997f (patch)
treed64863ecb3ea593b44e6b0ec0155ccee46dd7b3b /modules/taxonomy/taxonomy.pages.inc
parent102630219a8cb16e4c2052fbc05e5019aafd834e (diff)
downloadbrdo-bdc2373eabb8729931032c007600ca69ab1c997f.tar.gz
brdo-bdc2373eabb8729931032c007600ca69ab1c997f.tar.bz2
Issue #1000736 by fangel, stBorchert, adorsk: Fixed Term reference autocomplete widget having problems handling terms with commas.
Diffstat (limited to 'modules/taxonomy/taxonomy.pages.inc')
-rw-r--r--modules/taxonomy/taxonomy.pages.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc
index 3aed29011..0cca252d7 100644
--- a/modules/taxonomy/taxonomy.pages.inc
+++ b/modules/taxonomy/taxonomy.pages.inc
@@ -110,7 +110,7 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
->execute()
->fetchAllKeyed();
- $prefix = count($tags_typed) ? implode(', ', $tags_typed) . ', ' : '';
+ $prefix = count($tags_typed) ? drupal_implode_tags($tags_typed) . ', ' : '';
$term_matches = array();
foreach ($tags_return as $tid => $name) {
@@ -119,9 +119,7 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
if (strpos($name, ',') !== FALSE || strpos($name, '"') !== FALSE) {
$n = '"' . str_replace('"', '""', $name) . '"';
}
- else {
- $term_matches[$prefix . $n] = check_plain($name);
- }
+ $term_matches[$prefix . $n] = check_plain($name);
}
}