Changeset 18023 for branches/3.1

Timestamp:

05/24/2011 03:57:28 PM (13 years ago)

Author:

ryan

Message:

Mark import attachments as private. Schedule job to delete old import attachments. Introduce attachment context.

Location:

branches/3.1

Files:

• . (modified) (1 prop)
• wp-admin/custom-background.php (modified) (1 diff)
• wp-admin/custom-header.php (modified) (2 diffs)
• wp-admin/includes/import.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/post.php (modified) (4 diffs)

branches/3.1/wp-admin/custom-background.php

@@ -338 +338 @@
             'post_content' => $url,
             'post_mime_type' => $type,
-            'guid' => $url
+            'guid' => $url,
+            'context' => 'custom-background'
         );
 

branches/3.1/wp-admin/custom-header.php

@@ -596 +596 @@
         'post_content' => $url,
         'post_mime_type' => $type,
-        'guid' => $url);
+        'guid' => $url,
+        'context' => 'custom-header');
 
         // Save the data
@@ -688 +689 @@
             'post_content' => $url,
             'post_mime_type' => 'image/jpeg',
-            'guid' => $url
+            'guid' => $url,
+            'context' => 'custom-header'
         );
 

branches/3.1/wp-admin/includes/import.php

@@ -81 +81 @@
         'post_content' => $url,
         'post_mime_type' => $type,
-        'guid' => $url
+        'guid' => $url,
+        'context' => 'import',
+        'post_status' => 'private'
     );
 
@@ -87 +89 @@
     $id = wp_insert_attachment( $object, $file );
 
+    // schedule a cleanup for one day from now in case of failed import or missing wp_import_cleanup() call
+    wp_schedule_single_event( time() + 86400, 'importer_scheduled_cleanup', array( $id ) );
+
     return array( 'file' => $file, 'id' => $id );
 }

branches/3.1/wp-admin/includes/post.php

@@ -997 +997 @@
     $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
     $q['post_type'] = 'attachment';
-    $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : 'inherit';
+    $post_type = get_post_type_object( 'attachment' );
+    $states = array( 'inherit' );
+    if ( current_user_can( $post_type->cap->read_private_posts ) )
+        $states[] = 'private';
+
+    $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;
     $media_per_page = (int) get_user_option( 'upload_per_page' );
     if ( empty( $media_per_page ) || $media_per_page < 1 )

branches/3.1/wp-includes/default-filters.php

@@ -256 +256 @@
 add_action( 'wp_scheduled_delete',        'wp_scheduled_delete'            );
 add_action( 'admin_init',                 'send_frame_options_header', 10, 0 );
+add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment'           );
 
 // Navigation menu actions

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) {