--- taxonomy.module.orig	2005-05-26 23:32:46.837704217 +0200
+++ taxonomy.module	2005-05-26 23:32:46.838704000 +0200
@@ -93,10 +93,7 @@
 }
 
 function taxonomy_form_vocabulary($edit = array()) {
-  foreach (node_list() as $type) {
-    $node_type = node_invoke($type, 'node_name');
-    $nodes[$type] = $node_type ? $node_type : $type;
-  }
+  $nodes = node_name_list();
 
   $form .= form_textfield(t('Vocabulary name'), 'name', $edit['name'], 50, 64, t('The name for this vocabulary.  Example: "Topic".'), NULL, TRUE);
   $form .= form_textarea(t('Description'), 'description', $edit['description'], 60, 5, t('Description of the vocabulary; can be used by modules.'));