#154046: Optimize confirm_form syntax for common usage (and fix some $form_state bugs).

1 files changed, 2 insertions, 4 deletions

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index d12798c59..e65f88095 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1114,9 +1114,8 @@ function comment_delete(&$form_state, $cid = NULL) {
     return drupal_delete_confirm(
       array(
         'question' => t('Are you sure you want to delete the comment %title?', array('%title' => $comment->subject)),
-        'path' => 'node/'. $comment->nid,
-        'description' => t('Any replies to this comment will be lost. This action cannot be undone.'),
         'destination' => 'node/'. $comment->nid,
+        'description' => t('Any replies to this comment will be lost. This action cannot be undone.'),
       )
     );
   }
@@ -1344,9 +1343,8 @@ function comment_multiple_delete_confirm(&$form_state) {
       array(
         'form' => $form,
         'question' => t('Are you sure you want to delete these comments and all their children?'),
-        'path' => 'admin/content/comment',
-        'yes' => t('Delete all'),
         'destination' => 'admin/content/comment',
+        'yes' => t('Delete all'),
       )
     );
   }