Changeset 12312

Timestamp:

12/01/2009 11:28:20 PM (16 years ago)

Author:

azaozz

Message:

Fix multiple confirmation messages when restoring posts and pages from the trash, props caesarsgrunt, see #4529

Location:

trunk/wp-admin

Files:

• page.php (modified) (4 diffs)
• post.php (modified) (4 diffs)

trunk/wp-admin/page.php

@@ -73 +73 @@
     $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':
@@ -157 +163 @@
         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;
@@ -179 +179 @@
         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;
@@ -206 +200 @@
     }
 
-    $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;

trunk/wp-admin/post.php

@@ -78 +78 @@
     $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':
@@ -197 +203 @@
         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;
@@ -219 +219 @@
         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;
@@ -246 +240 @@
     }
 
-    $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;