Ticket #32991: 32991.patch

src/wp-includes/post.php

@@ -2610 +2610 @@
  * @param int  $postid       Optional. Post ID. Default 0.
  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
  *                           Default false.
- * @return array|false|WP_Post False on failure.
+ * @return WP_Post|null|false False on failure.
  */
 function wp_delete_post( $postid = 0, $force_delete = false ) {
         global $wpdb;
 
-        if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
+        if ( !$post = get_post( $postid ) )
                 return $post;
 
         if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS )
@@ -2753 +2753 @@
  *
  * @param int $post_id Optional. Post ID. Default is ID of the global $post
  *                     if EMPTY_TRASH_DAYS equals true.
- * @return false|array|WP_Post|null Post data array, otherwise false.
+ * @return WP_Post|null|false False on failure.
  */
 function wp_trash_post( $post_id = 0 ) {
         if ( !EMPTY_TRASH_DAYS )
@@ -2791 +2791 @@
          */
         do_action( 'trashed_post', $post_id );
 
-        return $post;
+        return get_post( $post_id );
 }
 
 /**
@@ -2800 +2800 @@
  * @since 2.9.0
  *
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
- * @return WP_Post|false WP_Post object. False on failure.
+ * @return WP_Post|null|false False on failure.
  */
 function wp_untrash_post( $post_id = 0 ) {
         if ( !$post = get_post($post_id, ARRAY_A) )
@@ -2838 +2838 @@
          */
         do_action( 'untrashed_post', $post_id );
 
-        return $post;
+        return get_post( $post_id );
 }
 
 /**
@@ -4873 +4873 @@
  * @param int  $post_id      Attachment ID.
  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
  *                           Default false.
- * @return mixed False on failure. Post data on success.
+ * @return WP_Post|null|false False on failure.
  */
 function wp_delete_attachment( $post_id, $force_delete = false ) {
         global $wpdb;
 
-        if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) )
+        if ( !$post = get_post( $post_id ) )
                 return $post;
 
         if ( 'attachment' != $post->post_type )

src/wp-includes/revision.php

@@ -383 +383 @@
  * @since 2.6.0
  *
  * @param int|WP_Post $revision_id Revision ID or revision object.
- * @return array|false|WP_Post|WP_Error|null Null or WP_Error if error, deleted post if success.
+ * @return WP_Post|null|false False on failure.
  */
 function wp_delete_post_revision( $revision_id ) {
         if ( ! $revision = wp_get_post_revision( $revision_id ) ) {