Changes in trunk/wp-admin/post.php [12312:12182]

File:

• trunk/wp-admin/post.php (modified) (5 diffs)

trunk/wp-admin/post.php

@@ -70 +70 @@
     }
 
-    wp_redirect( apply_filters( 'redirect_post_location', $location, $post_ID ) );
+    wp_redirect( $location );
 }
 
@@ -77 +77 @@
 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) {
@@ -203 +197 @@
         wp_die( __('Error in moving to trash...') );
 
-    wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
+    $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);
     exit();
     break;
@@ -219 +219 @@
         wp_die( __('Error in restoring from trash...') );
 
-    wp_redirect( add_query_arg('untrashed', 1, $sendback) );
+    $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);
     exit();
     break;
@@ -240 +246 @@
     }
 
-    wp_redirect( add_query_arg('deleted', 1, $sendback) );
+    $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);
     exit();
     break;