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

File:

• trunk/wp-admin/page.php (modified) (7 diffs)

trunk/wp-admin/page.php

@@ -65 +65 @@
         }
 
-        wp_redirect( apply_filters( 'redirect_page_location', $location, $page_ID ) );
+        wp_redirect($location);
 }
 
@@ -72 +72 @@
 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) {
@@ -157 +151 @@
         $post = & get_post($post_id);
 
-        if ( !current_user_can('delete_page', $post_id) )
+        if ( !current_user_can('delete_page', $page_id) )
                 wp_die( __('You are not allowed to move this page to the trash.') );
 
@@ -163 +157 @@
                 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, '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);
         exit();
         break;
@@ -173 +173 @@
         $post = & get_post($post_id);
 
-        if ( !current_user_can('delete_page', $post_id) )
+        if ( !current_user_can('delete_page', $page_id) )
                 wp_die( __('You are not allowed to move this page out of the trash.') );
 
@@ -179 +179 @@
                 wp_die( __('Error in restoring from trash...') );
 
-        wp_redirect( add_query_arg('untrashed', 1, $sendback) );
+        $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);
         exit();
         break;
@@ -200 +206 @@
         }
 
-        wp_redirect( add_query_arg('deleted', 1, $sendback) );
+        $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);
         exit();
         break;