Changes in branches/3.1/wp-includes/post.php [17519:18023]

File:

• branches/3.1/wp-includes/post.php (modified) (4 diffs)

branches/3.1/wp-includes/post.php

@@ -558 +558 @@
         return false;
 
-    // Unattached attachments are assumed to be published.
-    if ( ('attachment' == $post->post_type) && ('inherit' == $post->post_status) && ( 0 == $post->post_parent) )
-        return 'publish';
-
-    if ( ('attachment' == $post->post_type) && $post->post_parent && ($post->ID != $post->post_parent) )
-        return get_post_status($post->post_parent);
+    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 ) )
+            return get_post_status($post->post_parent);
+    }
 
     return $post->post_status;
@@ -3533 +3539 @@
     global $wpdb, $user_ID;
 
-    $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,
+    $defaults = array('post_status' => 'inherit', 'post_type' => 'post', 'post_author' => $user_ID,
         'ping_status' => get_option('default_ping_status'), 'post_parent' => 0,
         'menu_order' => 0, 'to_ping' =>  '', 'pinged' => '', 'post_password' => '',
-        'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0);
+        'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0, 'context' => '');
 
     $object = wp_parse_args($object, $defaults);
@@ -3551 +3557 @@
 
     $post_type = 'attachment';
-    $post_status = 'inherit';
+
+    if ( ! in_array( $post_status, array( 'inherit', 'private' ) ) )
+        $post_status = 'inherit';
 
     // Make sure we set a valid category.
@@ -3653 +3661 @@
     if ( isset($post_parent) && $post_parent < 0 )
         add_post_meta($post_ID, '_wp_attachment_temp_parent', $post_parent, true);
+
+    if ( ! empty( $context ) )
+        add_post_meta( $post_ID, '_wp_attachment_context', $context, true );
 
     if ( $update) {