Changeset 11807 for trunk/wp-admin/post.php

Timestamp:

08/12/2009 10:57:15 AM (17 years ago)

Author:

azaozz

Message:

Fix bulk edit, some cleanup and message fixes for moving in/out of the trash, see #4529

File:

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

trunk/wp-admin/post.php

@@ -56 +56 @@
         $location = explode('#', $location);
         $location = $location[0] . '#postcustom';
-    } elseif ($action == 'editattachment') {
-        $location = 'attachments.php';
     } elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) {
         $location = "post.php?action=edit&post=$post_ID&message=7";
@@ -116 +114 @@
     $post = get_post($post_ID);
 
-    if ( empty($post->ID) ) wp_die( __('You attempted to edit a post that doesn’t exist. Perhaps it was deleted?') );
-    if ( $post->post_status == 'trash' ) wp_die( __('You can’t edit this post because it is in the Trash. Please move it out of the Trash and try again.') );
+    if ( empty($post->ID) )
+        wp_die( __('You attempted to edit a post that doesn’t exist. Perhaps it was deleted?') );
+
+    if ( !current_user_can('edit_post', $post_ID) )
+        wp_die( __('You are not allowed to edit this post.') );
+
+    if ( 'trash' == $post->post_status )
+        wp_die( __('You can’t edit this post because it is in the Trash. Please restore it and try again.') );
 
     if ( 'post' != $post->post_type ) {
@@ -133 +137 @@
     enqueue_comment_hotkeys_js();
 
-    if ( current_user_can('edit_post', $post_ID) ) {
-        if ( $last = wp_check_post_lock( $post->ID ) ) {
-            $last_user = get_userdata( $last );
-            $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-            $message = sprintf( __( 'Warning: %s is currently editing this post' ), esc_html( $last_user_name ) );
-            $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
-            add_action('admin_notices', create_function( '', "echo '$message';" ) );
-        } else {
-            wp_set_post_lock( $post->ID );
-            wp_enqueue_script('autosave');
-        }
+    if ( $last = wp_check_post_lock( $post->ID ) ) {
+        $last_user = get_userdata( $last );
+        $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
+        $message = sprintf( __( 'Warning: %s is currently editing this post' ), esc_html( $last_user_name ) );
+        $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
+        add_action('admin_notices', create_function( '', "echo '$message';" ) );
+    } else {
+        wp_set_post_lock( $post->ID );
+        wp_enqueue_script('autosave');
     }
 
     $title = __('Edit Post');
-
-    if ( !current_user_can('edit_post', $post_ID) )
-        die ( __('You are not allowed to edit this post.') );
-
     $post = get_post_to_edit($post_ID);
 
@@ -184 +182 @@
 
 case 'trash':
-    $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
+    $post_id = isset($_GET['post']) ? intval($_GET['post']) : intval($_POST['post_ID']);
     check_admin_referer('trash-post_' . $post_id);
 
@@ -196 +194 @@
 
     $sendback = wp_get_referer();
-    if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('edit.php?trashed=1');
-    elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
-    else $sendback = add_query_arg('trashed', 1, $sendback);
+    if ( strpos($sendback, 'post.php') !== false )
+        $sendback = admin_url('edit.php?trashed=1');
+    else
+        $sendback = add_query_arg('trashed', 1, $sendback);
+
     wp_redirect($sendback);
     exit();
@@ -204 +204 @@
 
 case 'untrash':
-    $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
+    $post_id = isset($_GET['post']) ? intval($_GET['post']) : intval($_POST['post_ID']);
     check_admin_referer('untrash-post_' . $post_id);
 
@@ -210 +210 @@
 
     if ( !current_user_can('delete_post', $post_id) )
-        wp_die( __('You are not allowed to remove this post from the trash.') );
+        wp_die( __('You are not allowed to move this post out of the trash.') );
 
     if ( ! wp_untrash_post($post_id) )
-        wp_die( __('Error in removing from trash...') );
+        wp_die( __('Error in restoring from trash...') );
 
     $sendback = wp_get_referer();
-    if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('edit.php?untrashed=1');
-    elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
-    else $sendback = add_query_arg('untrashed', 1, $sendback);
+    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();
@@ -241 +243 @@
 
     $sendback = wp_get_referer();
-    if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('edit.php?deleted=1');
-    elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
-    else $sendback = add_query_arg('deleted', 1, $sendback);
+    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();