From b7ec019235e5afb04c89146bad4f64fdbaccc6ce Mon Sep 17 00:00:00 2001 From: Adam J. DiCarlo Date: Fri, 11 Mar 2011 12:36:11 -0800 Subject: [PATCH] Issue #949616 by adamdicarlo, dixon_: Fix term description loss in multiple parent confirm form. --- modules/taxonomy/taxonomy.admin.inc | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc index 8498681..d9aa19c 100644 --- a/modules/taxonomy/taxonomy.admin.inc +++ b/modules/taxonomy/taxonomy.admin.inc @@ -860,7 +860,14 @@ function taxonomy_term_confirm_parents($form, &$form_state, $vocabulary) { $question = t('Set multiple term parents?'); $description = '

' . t("Adding multiple parents to a term will cause the %vocabulary vocabulary to look for multiple parents on every term. Because multiple parents are not supported when using the drag and drop outline interface, drag and drop will be disabled if you enable this option. If you choose to have multiple parents, you will only be able to set parents by using the term edit form.", array('%vocabulary' => $vocabulary->name)) . '

'; $description .= '

' . t("You may re-enable the drag and drop interface at any time by reducing multiple parents to a single parent for the terms in this vocabulary.") . '

'; - return confirm_form($form, $question, drupal_get_destination(), $description, t('Set multiple parents')); + + // Avoid the term's description getting overwritten when we call + // confirm_form(). + $term_description = $form['description']; + $form = confirm_form($form, $question, drupal_get_destination(), $description, t('Set multiple parents')); + $form['confirm_form_description'] = $form['description']; + $form['description'] = $term_description; + return $form; } /** -- 1.6.3.3