Index: modules/taxonomy/taxonomy.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.install,v
retrieving revision 1.41
diff -u -p -r1.41 taxonomy.install
--- modules/taxonomy/taxonomy.install	20 Apr 2010 07:47:55 -0000	1.41
+++ modules/taxonomy/taxonomy.install	3 May 2010 11:42:18 -0000
@@ -260,7 +260,8 @@ function taxonomy_update_7002() {
 
   db_add_field('taxonomy_vocabulary', 'machine_name', $field);
 
-  foreach (taxonomy_get_vocabularies() as $vid => $vocabulary) {
+  $vids = db_query('SELECT vid FROM {taxonomy_vocabulary}')->fetchCol();
+  foreach ($vids as $vid) {
     $machine_name = 'vocabulary_' . $vid;
     db_update('taxonomy_vocabulary')
       ->fields(array('machine_name' => $machine_name))