Changeset 22673 for trunk/wp-admin/includes/media.php

Timestamp:

11/19/2012 08:10:38 AM (14 years ago)

Author:

nacin

Message:

Move code from image_attachment_fields_to_edit() to get_attachment_fields_to_edit(). The level of abstraction is unnecessary, and it makes it more difficult to call only the filter in the new media modal. Also, that function is sloooow. see #22186.

File:

• trunk/wp-admin/includes/media.php (modified) (2 diffs)

trunk/wp-admin/includes/media.php

@@ -811 +811 @@
  */
 function image_attachment_fields_to_edit($form_fields, $post) {
-        if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-                $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
-                if ( empty($alt) )
-                        $alt = '';
-
-                $form_fields['post_title']['required'] = true;
-
-                $form_fields['image_alt'] = array(
-                        'value' => $alt,
-                        'label' => __('Alternative Text'),
-                        'helps' => __('Alt text for the image, e.g. “The Mona Lisa”')
-                );
-
-                $form_fields['align'] = array(
-                        'label' => __('Alignment'),
-                        'input' => 'html',
-                        'html'  => image_align_input_fields($post, get_option('image_default_align')),
-                );
-
-                $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
-
-        } else {
-                unset( $form_fields['image_alt'] );
-        }
         return $form_fields;
 }
-
-add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2);
 
 /**
@@ -1001 +975 @@
         $form_fields = array_merge_recursive($form_fields, (array) $errors);
 
+        // This was formerly in image_attachment_fields_to_edit().
+        if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
+                $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
+                if ( empty($alt) )
+                        $alt = '';
+
+                $form_fields['post_title']['required'] = true;
+
+                $form_fields['image_alt'] = array(
+                        'value' => $alt,
+                        'label' => __('Alternative Text'),
+                        'helps' => __('Alt text for the image, e.g. “The Mona Lisa”')
+                );
+
+                $form_fields['align'] = array(
+                        'label' => __('Alignment'),
+                        'input' => 'html',
+                        'html'  => image_align_input_fields($post, get_option('image_default_align')),
+                );
+
+                $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
+
+        } else {
+                unset( $form_fields['image_alt'] );
+        }
+
+        return $form_fields;
+
         $form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);