Ticket #22642: 22642.3.diff

wp-includes/media.php

@@ -1388 +1388 @@
         }
 
         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 );
 }

wp-admin/includes/ajax-actions.php

@@ -1899 +1899 @@
         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'] ) ) {

wp-admin/includes/media.php

@@ -1287 +1287 @@
         $default_args = array(
                 'errors' => null,
                 'taxonomies' => false,
+                'description' => false,
         );
 
         $args = wp_parse_args( $args, $default_args );
@@ -1325 +1326 @@
         $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(