WP Merge with 2.5.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1275 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 11 insertions, 1 deletions

diff --git a/wp-admin/media.php b/wp-admin/media.php
index b280d3a..2508810 100644
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -9,8 +9,14 @@ wp_reset_vars(array('action'));
 
 switch( $action ) :
 case 'editattachment' :
-	$errors = media_upload_form_handler();
 	$attachment_id = (int) $_POST['attachment_id'];
+	check_admin_referer('media-form');
+
+	if ( !current_user_can('edit_post', $attachment_id) )
+		wp_die ( __('You are not allowed to edit this attachment.') );
+
+	$errors = media_upload_form_handler();
+
 	if ( empty($errors) ) {
 		$location = 'media.php';
 		if ( $referer = wp_get_original_referer() ) {
@@ -39,6 +45,10 @@ case 'edit' :
 		exit();
 	}
 	$att_id = (int) $_GET['attachment_id'];
+
+	if ( !current_user_can('edit_post', $att_id) )
+		wp_die ( __('You are not allowed to edit this attachment.') );
+
 	$att = get_post($att_id);
 
 	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);