Ticket #22642: 22642.3.diff

Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php       (revision 22925)
+++ wp-includes/media.php       (working copy)
@@ -1388,7 +1388,7 @@
        }
 
        if ( function_exists('get_compat_media_markup') )
-               $response['compat'] = get_compat_media_markup( $attachment->ID, array( 'taxonomies' => true ) );
+               $response['compat'] = get_compat_media_markup( $attachment->ID, array( 'taxonomies' => true, 'description' => true ) );
 
        return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta );
 }
Index: wp-admin/includes/ajax-actions.php
===================================================================
--- wp-admin/includes/ajax-actions.php  (revision 22925)
+++ wp-admin/includes/ajax-actions.php  (working copy)
@@ -1899,6 +1899,10 @@
        if ( 'attachment' != $post['post_type'] )
                wp_send_json_error();
 
+       // Handle the description field automatically, if a plugin adds it back.
+       if ( isset( $attachment_data['post_content'] ) )
+               $post['post_content'] = $attachment_data['post_content'];
+
        $post = apply_filters( 'attachment_fields_to_save', $post, $attachment_data );
 
        if ( isset( $post['errors'] ) ) {
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php (revision 22925)
+++ wp-admin/includes/media.php (working copy)
@@ -1287,6 +1287,7 @@
        $default_args = array(
                'errors' => null,
                'taxonomies' => false,
+               'description' => false,
        );
 
        $args = wp_parse_args( $args, $default_args );
@@ -1325,9 +1326,12 @@
        $form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
 
        unset( $form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
-               $form_fields['post_title'], $form_fields['post_excerpt'], $form_fields['post_content'],
+               $form_fields['post_title'], $form_fields['post_excerpt'],
                $form_fields['url'], $form_fields['menu_order'], $form_fields['image_url'] );
 
+       if ( ! $args['description'] )
+               unset( $form_fields['post_content'] );
+
        $media_meta = apply_filters( 'media_meta', '', $post );
 
        $defaults = array(