Ticket #4529: 4529-notices.diff

wp-admin/post.php

@@ -77 +77 @@
 elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
         $action = 'preview';
 
+$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');
+
 switch($action) {
 case 'postajaxpost':
 case 'post':
@@ -196 +200 @@
         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 +216 @@
         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 +237 @@
                         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;
 

wp-admin/page.php

@@ -72 +72 @@
 elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
         $action = 'preview';
 
+$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');
+
 switch($action) {
 case 'post':
         check_admin_referer('add-page');
@@ -156 +160 @@
         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 +176 @@
         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 +197 @@
                         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;