Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.363
diff -u -p -r1.363 taxonomy.module
--- modules/taxonomy/taxonomy.module	22 Jun 2007 08:46:15 -0000	1.363
+++ modules/taxonomy/taxonomy.module	29 Jun 2007 17:32:54 -0000
@@ -1201,6 +1201,7 @@ function _taxonomy_term_select($title, $
       $value = $tree[0]->tid;
     }
   }
+  else return array();
 
   return array('#type' => 'select',
     '#title' => $title,
@@ -1440,7 +1441,7 @@ function taxonomy_term_page($str_tids = 
  * Page to edit a vocabulary.
  */
 function taxonomy_admin_vocabulary_edit($vocabulary) {
-  if ($_POST['op'] == t('Delete') || $_POST['confirm']) {
+  if (isset($_POST['op']) && $_POST['op'] == t('Delete') || isset($_POST['confirm']) && $_POST['confirm']) {
     return drupal_get_form('taxonomy_vocabulary_confirm_delete', $vocabulary->vid);
   }
   return drupal_get_form('taxonomy_form_vocabulary', (array)$vocabulary);