Ticket #22759: 22759.2.diff

wp-includes/media.php

@@ -1395 +1395 @@
         }
 
         if ( function_exists('get_compat_media_markup') )
-                $response['compat'] = get_compat_media_markup( $attachment->ID, array( 'taxonomies' => true, 'description' => true ) );
+                $response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
 
         return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta );
 }

wp-admin/includes/media.php

@@ -1286 +1286 @@
 
         $default_args = array(
                 'errors' => null,
-                'taxonomies' => false,
-                'description' => false,
+                'in_modal' => false,
         );
 
         $user_can_edit = current_user_can( 'edit_post', $attachment_id );
@@ -1297 +1296 @@
 
         $form_fields = array();
 
-        if ( $args['taxonomies'] ) {
+        if ( $args['in_modal'] ) {
                 foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
                         $t = (array) get_taxonomy($taxonomy);
                         if ( ! $t['public'] || ! $t['show_ui'] )
@@ -1332 +1331 @@
                 $form_fields['post_title'], $form_fields['post_excerpt'],
                 $form_fields['url'], $form_fields['menu_order'], $form_fields['image_url'] );
 
-        if ( ! $args['description'] )
+        if ( ! $args['in_modal'] )
                 unset( $form_fields['post_content'] );
 
         $media_meta = apply_filters( 'media_meta', '', $post );
 
         $defaults = array(
-                'input'      => 'text',
-                'required'   => false,
-                'value'      => '',
-                'extra_rows' => array(),
+                'input'         => 'text',
+                'required'      => false,
+                'value'         => '',
+                'extra_rows'    => array(),
+                'show_in_edit'  => true,
+                'show_in_modal' => true,
         );
 
         $hidden_fields = array();
@@ -1361 +1362 @@
 
                 $field = array_merge( $defaults, $field );
 
+                if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) )
+                        continue;
+
                 if ( $field['input'] == 'hidden' ) {
                         $hidden_fields[$name] = $field['value'];
                         continue;