Changes in branches/3.1/wp-admin/includes/media.php [18018:18366]

File:

• branches/3.1/wp-admin/includes/media.php (modified) (3 diffs)

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

@@ -229 +229 @@
     ), $post_data );
 
+    // This should never be set as it would then overwrite an existing attachment.
+    if ( isset( $attachment['ID'] ) )
+        unset( $attachment['ID'] );
+
     // Save the data
     $id = wp_insert_attachment($attachment, $file, $post_id);
@@ -281 +285 @@
         'post_content' => $content,
     ), $post_data );
+
+    // This should never be set as it would then overwrite an existing attachment.
+    if ( isset( $attachment['ID'] ) )
+        unset( $attachment['ID'] );
 
     // Save the attachment metadata
@@ -420 +428 @@
     if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
         $post = $_post = get_post($attachment_id, ARRAY_A);
+        $post_type_object = get_post_type_object( $post[ 'post_type' ] );
+
+        if ( !current_user_can( $post_type_object->cap->edit_post, $attachment_id ) )
+            continue;
+
         if ( isset($attachment['post_content']) )
             $post['post_content'] = $attachment['post_content'];