- Patch #631066 by yhed: taxonomy_autocomplete() doesn't need to access .

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'),
   );

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.