From f6c60338e57ed72f03015c2fa785ea4906dddf71 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 1 Dec 2009 23:28:20 +0000
Subject: [PATCH] Fix multiple confirmation messages when restoring posts and
 pages from the trash, props caesarsgrunt, see #4529

git-svn-id: http://svn.automattic.com/wordpress/trunk@12312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/page.php | 30 +++++++++---------------------
 wp-admin/post.php | 30 +++++++++---------------------
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/wp-admin/page.php b/wp-admin/page.php
index 30d550d59..a4a928025 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -72,6 +72,12 @@ if (isset($_POST['deletepost']))
 elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
 	$action = 'preview';
 
+$sendback = wp_get_referer();
+if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false )
+	$sendback = admin_url('edit-pages.php');
+else
+	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+
 switch($action) {
 case 'post':
 	check_admin_referer('add-page');
@@ -156,13 +162,7 @@ case 'trash':
 	if ( !wp_trash_post($post_id) )
 		wp_die( __('Error in moving to trash...') );
 
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
-	if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false )
-		$sendback = admin_url('edit-pages.php?trashed=1&ids='.$post_id);
-	else
-		$sendback = add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback );
-
-	wp_redirect($sendback);
+	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
 	exit();
 	break;
 
@@ -178,13 +178,7 @@ case 'untrash':
 	if ( !wp_untrash_post($post_id) )
 		wp_die( __('Error in restoring from trash...') );
 
-	$sendback = wp_get_referer();
-	if ( strpos($sendback, 'page.php') !== false )
-		$sendback = admin_url('edit-pages.php?untrashed=1');
-	else
-		$sendback = add_query_arg('untrashed', 1, $sendback);
-
-	wp_redirect($sendback);
+	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
 	exit();
 	break;
 
@@ -205,13 +199,7 @@ case 'delete':
 			wp_die( __('Error in deleting...') );
 	}
 
-	$sendback = wp_get_referer();
-	if ( strpos($sendback, 'page.php') !== false )
-		$sendback = admin_url('edit-pages.php?deleted=1');
-	else
-		$sendback = add_query_arg('deleted', 1, $sendback);
-
-	wp_redirect($sendback);
+	wp_redirect( add_query_arg('deleted', 1, $sendback) );
 	exit();
 	break;
 
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 867011030..8f5c3f052 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -77,6 +77,12 @@ if ( isset( $_POST['deletepost'] ) )
 elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
 	$action = 'preview';
 
+$sendback = wp_get_referer();
+if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false )
+	$sendback = admin_url('edit.php');
+else
+	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+
 switch($action) {
 case 'postajaxpost':
 case 'post':
@@ -196,13 +202,7 @@ case 'trash':
 	if ( ! wp_trash_post($post_id) )
 		wp_die( __('Error in moving to trash...') );
 
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
-	if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false )
-		$sendback = admin_url('edit.php?trashed=1&ids='.$post_id);
-	else
-		$sendback = add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback );
-
-	wp_redirect($sendback);
+	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
 	exit();
 	break;
 
@@ -218,13 +218,7 @@ case 'untrash':
 	if ( ! wp_untrash_post($post_id) )
 		wp_die( __('Error in restoring from trash...') );
 
-	$sendback = wp_get_referer();
-	if ( strpos($sendback, 'post.php') !== false )
-		$sendback = admin_url('edit.php?untrashed=1');
-	else
-		$sendback = add_query_arg('untrashed', 1, $sendback);
-
-	wp_redirect($sendback);
+	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
 	exit();
 	break;
 
@@ -245,13 +239,7 @@ case 'delete':
 			wp_die( __('Error in deleting...') );
 	}
 
-	$sendback = wp_get_referer();
-	if ( strpos($sendback, 'post.php') !== false )
-		$sendback = admin_url('edit.php?deleted=1');
-	else
-		$sendback = add_query_arg('deleted', 1, $sendback);
-
-	wp_redirect($sendback);
+	wp_redirect( add_query_arg('deleted', 1, $sendback) );
 	exit();
 	break;