Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.583
diff -u -p -r1.583 taxonomy.module
--- modules/taxonomy/taxonomy.module	28 Mar 2010 11:39:35 -0000	1.583
+++ modules/taxonomy/taxonomy.module	6 Apr 2010 02:40:00 -0000
@@ -280,6 +280,10 @@ function taxonomy_menu() {
     'page arguments' => array('taxonomy_form_term', 2),
     'access callback' => 'taxonomy_term_edit_access',
     'access arguments' => array(2),
+    // Adding a taxonomy term is within the "admin" path, so it uses the admin
+    // theme. Editing a term should use the same theme as adding one.
+    'theme callback' => 'variable_get',
+    'theme arguments' => array('admin_theme'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 10,
     'file' => 'taxonomy.admin.inc',
@@ -338,6 +342,16 @@ function taxonomy_menu() {
 }
 
 /**
+ * Implements hook_admin_paths().
+ */
+function taxonomy_admin_paths() {
+  $paths = array(
+    'taxonomy/term/*/edit' => TRUE,
+  );
+  return $paths;
+}
+
+/**
  * Return edit access for a given term.
  */
 function taxonomy_term_edit_access($term) {