Changeset 49985

Timestamp:

01/20/2021 04:39:24 AM (4 years ago)

Author:

peterwilsoncc

Message:

Media: Ensure get_post_status() returns correct result for attachments.

Prevent get_post_status() returning false for attachments if the parent post has been deleted. The returned attachment post status is now passed through the get_post_status filter.

Add tests for get_post_status().

Props peterwilsoncc, timothyblynjacobs for review.
Fixes #52326.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (2 diffs)
• tests/phpunit/tests/post/getPostStatus.php (added)

trunk/src/wp-includes/post.php

@@ -902 +902 @@
     }
 
-    if ( 'attachment' === $post->post_type ) {
-        if ( 'private' === $post->post_status ) {
-            return 'private';
-        }
-
-        // Unattached attachments are assumed to be published.
-        if ( ( 'inherit' === $post->post_status ) && ( 0 == $post->post_parent ) ) {
-            return 'publish';
-        }
-
-        // Inherit status from the parent.
-        if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
-            $parent_post_status = get_post_status( $post->post_parent );
-            if ( 'trash' === $parent_post_status ) {
-                return get_post_meta( $post->post_parent, '_wp_trash_meta_status', true );
-            } else {
-                return $parent_post_status;
+    $post_status = $post->post_status;
+
+    if (
+        'attachment' === $post->post_type &&
+        'inherit' === $post_status
+    ) {
+        // Attachment permitted statuses: 'inherit', , see wp_insert_post().
+
+        if (
+            0 === $post->post_parent ||
+            ! get_post( $post->post_parent ) ||
+            $post->ID === $post->post_parent
+        ) {
+            // Unattached attachments with inherit status are assumed to be published.
+            $post_status = 'publish';
+        } elseif ( 'trash' === get_post_status( $post->post_parent ) ) {
+            // Get parent status prior to trashing.
+            $post_status = get_post_meta( $post->post_parent, '_wp_trash_meta_status', true );
+            if ( ! $post_status ) {
+                // Assume publish as above.
+                $post_status = 'publish';
             }
-        }
+        } else {
+            $post_status = get_post_status( $post->post_parent );
+        }
+    } elseif (
+        'attachment' === $post->post_type &&
+        ! in_array( $post_status, array( 'private', 'trash', 'auto-draft' ), true )
+    ) {
+        /*
+         * Ensure uninherited attachments have a permitted status either 'private', 'trash', 'auto-draft'.
+         * This is to match the logic in wp_insert_post().
+         *
+         * Note: 'inherit' is excluded from this check as it is resolved to the parent post's
+         * status in the logic block above.
+         */
+        $post_status = 'publish';
     }
 
@@ -927 +945 @@
      *
      * @since 4.4.0
+     * @since 5.7.0 The attachment post type is now passed through this filter.
      *
      * @param string  $post_status The post status.
      * @param WP_Post $post        The post object.
      */
-    return apply_filters( 'get_post_status', $post->post_status, $post );
+    return apply_filters( 'get_post_status', $post_status, $post );
 }