? .buildpath
? .project
? .settings
? 865970.patch
? dblog_clear_confirm.patch
? taxonomy_autocomplete.patch
? ui.borked.patch
? ui.working.patch
? sites/all/modules/crud.inc
? sites/all/modules/devel
? sites/all/modules/extensible.patch
? sites/all/modules/module
? sites/all/modules/views
? sites/all/modules/views.tar.gz
? sites/default/files
? sites/default/settings.php
Index: modules/taxonomy/taxonomy.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.pages.inc,v
retrieving revision 1.55
diff -u -p -r1.55 taxonomy.pages.inc
--- modules/taxonomy/taxonomy.pages.inc	6 Oct 2010 13:38:40 -0000	1.55
+++ modules/taxonomy/taxonomy.pages.inc	9 Oct 2010 15:54:45 -0000
@@ -92,7 +92,8 @@ function taxonomy_autocomplete($field_na
     // Part of the criteria for the query come from the field's own settings.
     $vids = array();
     foreach ($field['settings']['allowed_values'] as $tree) {
-      $vids[] = $tree['vid'];
+      $vid = db_query('SELECT vid FROM {taxonomy_vocabulary} WHERE machine_name = :machine_name', array(':machine_name' => $tree['vocabulary']))->fetchField();
+      $vids[] = $vid;
     }
 
     $query = db_select('taxonomy_term_data', 't');