summaryrefslogtreecommitdiff
path: root/modules/taxonomy/taxonomy.admin.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-13 07:53:02 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-13 07:53:02 +0000
commit8119c5da9a0746bfa87ac27abeafb849f152d1ce (patch)
treeecaf3c2ccc8140211755febebf3071d87035fafa /modules/taxonomy/taxonomy.admin.inc
parent6987dd4cab489d47a42f1331e882d3dbf7635913 (diff)
downloadbrdo-8119c5da9a0746bfa87ac27abeafb849f152d1ce.tar.gz
brdo-8119c5da9a0746bfa87ac27abeafb849f152d1ce.tar.bz2
- Patch #735662 by duellj, tstoeckler: critical bug: hook_form_alter() can easily clobber a text format.
Diffstat (limited to 'modules/taxonomy/taxonomy.admin.inc')
-rw-r--r--modules/taxonomy/taxonomy.admin.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index 4ae0e5182..59defe82c 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -837,6 +837,12 @@ function taxonomy_form_term_submit($form, &$form_state) {
*/
function taxonomy_form_term_submit_builder($form, &$form_state) {
$term = (object) $form_state['values'];
+
+ // Convert text_format field into values expected by taxonomy_term_save().
+ $description = $form_state['values']['description'];
+ $term->description = $description['value'];
+ $term->format = $description['format'];
+
field_attach_submit('taxonomy_term', $term, $form, $form_state);
$form_state['term'] = (array) $term;