Ticket #22759: 22759.throw-in-the-towel.diff

wp-includes/js/media-editor.js

@@ -554 +554 @@
                                 props = wp.media.string.props( props, attachment );
 
                                 options = {
-                                        id: attachment.id
+                                        id:           attachment.id,
+                                        post_content: attachment.description
                                 };
 
                                 if ( props.linkUrl )

wp-includes/js/media-views.js

@@ -2829 +2829 @@
                                         width:         '',
                                         height:        '',
                                         compat:        false,
-                                        alt:           ''
+                                        alt:           '',
+                                        description:   '',
                                 });
 
                         options.buttons  = this.buttons;

wp-includes/media.php

@@ -1749 +1749 @@
                                 <# } #>/>
                         </label>
                 <# } #>
+                        <label class="setting" data-setting="description">
+                                <span><?php _e('Description'); ?></span>
+                                <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
+                        </label>
         </script>
 
         <script type="text/html" id="tmpl-media-selection">

wp-admin/includes/ajax-actions.php

@@ -1884 +1884 @@
         if ( isset( $changes['caption'] ) )
                 $post['post_excerpt'] = $changes['caption'];
 
+        if ( isset( $changes['description'] ) )
+                $post['post_content'] = $changes['description'];
+
         if ( isset( $changes['alt'] ) ) {
                 $alt = get_post_meta( $id, '_wp_attachment_image_alt', true );
                 $new_alt = stripslashes( $changes['alt'] );

wp-admin/includes/meta-boxes.php

@@ -313 +313 @@
         );
 ?>
 <p>
-        <label class="screen-reader-text" for="content"><strong><?php _e( 'Attachment Page Content' ); ?></strong></label>
+        <label class="screen-reader-text" for="content"><strong><?php _e( 'Description' ); ?></strong></label>
         <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
 </p>
 <?php

wp-admin/includes/media.php

@@ -1329 +1329 @@
         $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_title'], $form_fields['post_excerpt'], $form_fields['post_content'],
                 $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(

wp-admin/edit-form-advanced.php

@@ -107 +107 @@
         wp_enqueue_script( 'image-edit' );
         wp_enqueue_style( 'imgareaselect' );
         add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' );
-        add_meta_box( 'attachmentdata', __('Attachment Page Content'), 'attachment_content_meta_box', null, 'normal', 'core' );
+        add_meta_box( 'attachmentdata', __('Description'), 'attachment_content_meta_box', null, 'normal', 'core' );
         add_action( 'edit_form_after_title', 'edit_form_image_editor' );
 } else {
         add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' );