diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-11-13 09:24:06 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-11-13 09:24:06 +0000 |
| commit | 85161f230f0f1b8a409b39a47ee346f6bd60a33a (patch) | |
| tree | 219ea040edcc147f1c9b577ee5a5afe556659cb6 /modules | |
| parent | 91bd3ca8ce1268aea0b3d65070f0598a4b4b0fc3 (diff) | |
| download | brdo-85161f230f0f1b8a409b39a47ee346f6bd60a33a.tar.gz brdo-85161f230f0f1b8a409b39a47ee346f6bd60a33a.tar.bz2 | |
- Patch #631066 by yhed: taxonomy_autocomplete() doesn't need to access .
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 3 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.pages.inc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 677321c13..5de8aa538 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1216,8 +1216,7 @@ function taxonomy_field_widget(&$form, &$form_state, $field, $instance, $langcod $element += array( '#type' => 'textfield', '#default_value' => taxonomy_implode_tags($tags), - // @todo Path should include the object type as well. - '#autocomplete_path' => 'taxonomy/autocomplete/'. $field['field_name'] .'/'. $instance['bundle'], + '#autocomplete_path' => $instance['widget']['settings']['autocomplete_path'] . '/' . $field['field_name'], '#size' => $instance['widget']['settings']['size'], '#element_validate' => array('taxonomy_autocomplete_validate'), ); diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index f79dc97a3..83c9c9870 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -77,8 +77,7 @@ function taxonomy_term_feed($term) { /** * Helper function for autocompletion */ -function taxonomy_autocomplete($field_name, $bundle, $tags_typed = '') { - $instance = field_info_instance($field_name, $bundle); +function taxonomy_autocomplete($field_name, $tags_typed = '') { $field = field_info_field($field_name); // The user enters a comma-separated list of tags. We only autocomplete the last tag. |