From 7093495f7c209d712ce951cb57781710f19f2653 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Sun, 24 Jun 2007 10:09:53 +0000
Subject: #154046: Optimize confirm_form syntax for common usage (and fix some
 $form_state bugs).

---
 modules/node/node.module | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'modules/node/node.module')

diff --git a/modules/node/node.module b/modules/node/node.module
index 6463a7f81..ccc34ae98 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1743,9 +1743,8 @@ function node_multiple_delete_confirm(&$form_state) {
     array(
       'form' => $form,
       'question' => t('Are you sure you want to delete these items?'),
-      'path' => 'admin/content/node',
-      'yes' => t('Delete all'),
       'destination' => 'admin/content/node',
+      'yes' => t('Delete all'),
     )
   );
 }
@@ -2443,7 +2442,7 @@ function node_delete_confirm(&$form_state, $node) {
   return drupal_delete_confirm(
     array(
       'question' => t('Are you sure you want to delete %title?', array('%title' => $node->title)),
-      'path' => isset($_GET['destination']) ? $_GET['destination'] : 'node/'. $node->nid,
+      'cancel' => isset($_GET['destination']) ? $_GET['destination'] : 'node/'. $node->nid,
       'destination' => isset($_GET['destination']) ? $_GET['destination'] : '<front>',
     )
   );
-- 
cgit v1.2.3