summaryrefslogtreecommitdiff
path: root/modules/taxonomy/taxonomy.admin.inc
diff options
context:
space:
mode:
Diffstat (limited to 'modules/taxonomy/taxonomy.admin.inc')
-rw-r--r--modules/taxonomy/taxonomy.admin.inc8
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index 715246d92..e7c9e69b6 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -647,10 +647,10 @@ function taxonomy_form_term($form, &$form_state, $edit = array(), $vocabulary =
'#weight' => -5,
);
$form['description'] = array(
- '#type' => 'textarea',
+ '#type' => 'text_format',
'#title' => t('Description'),
'#default_value' => $edit['description'],
- '#text_format' => $edit['format'],
+ '#format' => $edit['format'],
'#weight' => 0,
);
@@ -780,10 +780,6 @@ function taxonomy_form_term_submit($form, &$form_state) {
return;
}
- // Massage #text_format.
- $form_state['values']['format'] = $form_state['values']['description_format'];
- unset($form_state['values']['description_format']);
-
$term = taxonomy_form_term_submit_builder($form, $form_state);
$status = taxonomy_term_save($term);