Changeset 24201

Timestamp:

05/08/2013 06:56:54 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices when deleting or restoring an item that no longer exists. props johnbillion, ocean90. fixes #24246.

File:

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

trunk/wp-admin/post.php

@@ -134 +134 @@
     }
 
-    if ( empty($post->ID) )
-        wp_die( __('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?') );
-
-    if ( null == $post_type_object )
-        wp_die( __('Unknown post type.') );
-
-    if ( !current_user_can($post_type_object->cap->edit_post, $post_id) )
-        wp_die( __('You are not allowed to edit this item.') );
+    if ( ! $post )
+        wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+
+    if ( ! $post_type_object )
+        wp_die( __( 'Unknown post type.' ) );
+
+    if ( ! current_user_can( $post_type_object->cap->edit_post, $post_id ) )
+        wp_die( __( 'You are not allowed to edit this item.' ) );
 
     if ( 'trash' == $post->post_status )
-        wp_die( __('You can’t edit this item because it is in the Trash. Please restore it and try again.') );
-
-    if ( !empty( $_GET['get-post-lock'] ) ) {
+        wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+
+    if ( ! empty( $_GET['get-post-lock'] ) ) {
         wp_set_post_lock( $post_id );
         wp_redirect( get_edit_post_link( $post_id, 'url' ) );
@@ -221 +221 @@
     check_admin_referer('trash-post_' . $post_id);
 
-    if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
-        wp_die( __('You are not allowed to move this item to the Trash.') );
+    if ( ! $post )
+        wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+
+    if ( ! $post_type_object )
+        wp_die( __( 'Unknown post type.' ) );
+
+    if ( ! current_user_can( $post_type_object->cap->delete_post, $post_id ) )
+        wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
 
     if ( $user_id = wp_check_post_lock( $post_id ) ) {
@@ -229 +235 @@
     }
 
-    if ( ! wp_trash_post($post_id) )
-        wp_die( __('Error in moving to Trash.') );
+    if ( ! wp_trash_post( $post_id ) )
+        wp_die( __( 'Error in moving to Trash.' ) );
 
     wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
@@ -239 +245 @@
     check_admin_referer('untrash-post_' . $post_id);
 
-    if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
-        wp_die( __('You are not allowed to move this item out of the Trash.') );
-
-    if ( ! wp_untrash_post($post_id) )
-        wp_die( __('Error in restoring from Trash.') );
+    if ( ! $post )
+        wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+
+    if ( ! $post_type_object )
+        wp_die( __( 'Unknown post type.' ) );
+
+    if ( ! current_user_can( $post_type_object->cap->delete_post, $post_id ) )
+        wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+
+    if ( ! wp_untrash_post( $post_id ) )
+        wp_die( __( 'Error in restoring from Trash.' ) );
 
     wp_redirect( add_query_arg('untrashed', 1, $sendback) );
@@ -252 +264 @@
     check_admin_referer('delete-post_' . $post_id);
 
-    if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
-        wp_die( __('You are not allowed to delete this item.') );
-
-    $force = !EMPTY_TRASH_DAYS;
+    if ( ! $post )
+        wp_die( __( 'This item has already been deleted.' ) );
+
+    if ( ! $post_type_object )
+        wp_die( __( 'Unknown post type.' ) );
+
+    if ( ! current_user_can( $post_type_object->cap->delete_post, $post_id ) )
+        wp_die( __( 'You are not allowed to delete this item.' ) );
+
+    $force = ! EMPTY_TRASH_DAYS;
     if ( $post->post_type == 'attachment' ) {
-        $force = ( $force || !MEDIA_TRASH );
-        if ( ! wp_delete_attachment($post_id, $force) )
-            wp_die( __('Error in deleting.') );
-    } else {
-        if ( !wp_delete_post($post_id, $force) )
-            wp_die( __('Error in deleting.') );
+        $force = ( $force || ! MEDIA_TRASH );
+        if ( ! wp_delete_attachment( $post_id, $force ) )
+            wp_die( __( 'Error in deleting.' ) );
+    } else {
+        if ( ! wp_delete_post( $post_id, $force ) )
+            wp_die( __( 'Error in deleting.' ) );
     }