diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-07 23:14:20 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-07 23:14:20 +0000 |
| commit | 47371be0a5353aef7b34d5bdc70d31c6fd249dfc (patch) | |
| tree | 9373f976babd62d6cfe6de905e3bc8ea8bb6b6b0 /modules/taxonomy/taxonomy.admin.inc | |
| parent | c5bfbe7fa6bf237cf956a9367be2aa723bf9bdaf (diff) | |
| download | brdo-47371be0a5353aef7b34d5bdc70d31c6fd249dfc.tar.gz brdo-47371be0a5353aef7b34d5bdc70d31c6fd249dfc.tar.bz2 | |
#414424 by sun, chx, Arancaytar, yched, et al: Introduce Form API #type 'text_format' for additional DX/security around rich text fields.
Diffstat (limited to 'modules/taxonomy/taxonomy.admin.inc')
| -rw-r--r-- | modules/taxonomy/taxonomy.admin.inc | 8 |
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); |