- Patch #805228 by catch: unnecessary query in taxonomy_field_extra_fields().

modules/taxonomy/taxonomy.module

@@ -143,9 +143,9 @@ function taxonomy_term_uri($term) {
  */
 function taxonomy_field_extra_fields() {
   $return = array();
-
-  foreach (taxonomy_vocabulary_get_names() as $machine_name => $vocabulary) {
-    $return['taxonomy_term'][$machine_name] = array(
+  $info = entity_get_info('taxonomy_term');
+  foreach (array_keys($info['bundles']) as $bundle) {
+    $return['taxonomy_term'][$bundle] = array(
       'name' => array(
         'label' => t('Name'),
         'description' => t('Term name textfield'),