#67647 by fgm and nickl. Don't make a taxonomy option for vocabularies without terms.

modules/taxonomy/taxonomy.module

@@ -565,8 +565,8 @@ function taxonomy_form_all($free_tags = 0) {
   foreach ($vocabularies as $vid => $vocabulary) {
     if ($vocabulary->tags && !$free_tags) { continue; }
     $tree = taxonomy_get_tree($vid);
-    $options[$vocabulary->name] = array();
-    if ($tree) {
+    if ($tree && (count($tree) > 1)) {
+      $options[$vocabulary->name] = array();
       foreach ($tree as $term) {
         $options[$vocabulary->name][$term->tid] = str_repeat('-', $term->depth) . $term->name;
       }