3 files changed, 7 insertions, 7 deletions
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index e89923ba9..8cdd14b2d 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -656,7 +656,7 @@ function taxonomy_form_term($form, &$form_state, $edit = array(), $vocabulary =
     $defaults = array(
       'name' => '',
       'description' => '',
-      'format' => filter_default_format(),
+      'format' => NULL,
       'vocabulary_machine_name' => isset($vocabulary) ? $vocabulary->machine_name : NULL,
       'tid' => NULL,
       'weight' => 0,
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index 51444fe3d..8bd3a31db 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -52,9 +52,8 @@ function taxonomy_schema() {
       ),
       'format' => array(
         'type' => 'int',
-        'size' => 'small',
-        'not null' => TRUE,
-        'default' => 0,
+        'unsigned' => TRUE,
+        'not null' => FALSE,
         'description' => 'The {filter_format}.format of the description.',
       ),
       'weight' => array(
@@ -736,9 +735,8 @@ function taxonomy_update_7005(&$sandbox) {
 function taxonomy_update_7006() {
   db_add_field('taxonomy_term_data', 'format', array(
     'type' => 'int',
-    'size' => 'small',
-    'not null' => TRUE,
-    'default' => 0,
+    'unsigned' => TRUE,
+    'not null' => FALSE,
     'description' => 'The {filter_format}.format of the description.',
   ));
 }
diff --git a/modules/taxonomy/taxonomy.test b/modules/taxonomy/taxonomy.test
index b71cc62c5..9edc6c70f 100644
--- a/modules/taxonomy/taxonomy.test
+++ b/modules/taxonomy/taxonomy.test
@@ -34,6 +34,8 @@ class TaxonomyWebTestCase extends DrupalWebTestCase {
     $term = new stdClass();
     $term->name = $this->randomName();
     $term->description = $this->randomName();
+    // Use the first available text format.
+    $term->format = db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField();
     $term->vid = $vocabulary->vid;
     taxonomy_term_save($term);
     return $term;