#153781: Convert all remaining confirm_forms() to deletion api.

1 files changed, 8 insertions, 6 deletions

diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 8db4a3457..17e169f8c 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -384,13 +384,14 @@ function taxonomy_vocabulary_confirm_delete(&$form_state, $vid) {
   $form['type'] = array('#type' => 'value', '#value' => 'vocabulary');
   $form['vid'] = array('#type' => 'value', '#value' => $vid);
   $form['name'] = array('#type' => 'value', '#value' => $vocabulary->name);
+
+  $options = array('description' => t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'));
+
   return confirm_form($form,
                   t('Are you sure you want to delete the vocabulary %title?',
                   array('%title' => $vocabulary->name)),
                   'admin/content/taxonomy',
-                  t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'),
-                  t('Delete'),
-                  t('Cancel'));
+                  $options);
 }
 
 function taxonomy_vocabulary_confirm_delete_submit($form, &$form_state) {
@@ -620,13 +621,14 @@ function taxonomy_term_confirm_delete(&$form_state, $tid) {
   $form['type'] = array('#type' => 'value', '#value' => 'term');
   $form['name'] = array('#type' => 'value', '#value' => $term->name);
   $form['tid'] = array('#type' => 'value', '#value' => $tid);
+
+  $options = array('description' => t('Deleting a term will delete all its children if there are any. This action cannot be undone.'));
+
   return confirm_form($form,
                   t('Are you sure you want to delete the term %title?',
                   array('%title' => $term->name)),
                   'admin/content/taxonomy',
-                  t('Deleting a term will delete all its children if there are any. This action cannot be undone.'),
-                  t('Delete'),
-                  t('Cancel'));
+                  $options);
 }
 
 function taxonomy_term_confirm_delete_submit($form, &$form_state) {