Changeset 22929

Timestamp:

11/29/2012 11:52:30 PM (14 years ago)

Author:

ryan

Message:

Introduce API to add back the description field in the new media popup.

Props nacin
fixes #22642

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/ajax-actions.php

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

trunk/wp-admin/includes/media.php

@@ -1288 +1288 @@
                 'errors' => null,
                 'taxonomies' => false,
+                'description' => false,
         );
 
@@ -1326 +1327 @@
 
         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 );

trunk/wp-includes/media.php

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