? .cache
? .settings
? sites/default/private
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.537
diff -u -p -r1.537 taxonomy.module
--- modules/taxonomy/taxonomy.module	11 Nov 2009 17:10:49 -0000	1.537
+++ modules/taxonomy/taxonomy.module	12 Nov 2009 17:11:03 -0000
@@ -1216,8 +1216,7 @@ function taxonomy_field_widget(&$form, &
   $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'] .'/'. $instance['object_type'] . '/' . $instance['bundle'] .'/'. $field['field_name'],
     '#size' => $instance['widget']['settings']['size'],
     '#element_validate' => array('taxonomy_autocomplete_validate'),
   );
Index: modules/taxonomy/taxonomy.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.pages.inc,v
retrieving revision 1.44
diff -u -p -r1.44 taxonomy.pages.inc
--- modules/taxonomy/taxonomy.pages.inc	7 Nov 2009 14:18:07 -0000	1.44
+++ modules/taxonomy/taxonomy.pages.inc	12 Nov 2009 17:06:25 -0000
@@ -77,8 +77,8 @@ 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($obj_type, $bundle, $field_name, $tags_typed = '') {
+  $instance = field_info_instance($obj_type, $field_name, $bundle);
   $field = field_info_field($field_name);
 
   // The user enters a comma-separated list of tags. We only autocomplete the last tag.