Changeset 12110

Timestamp:

10/26/2009 05:56:28 PM (17 years ago)

Author:

markjaquith

Message:

Consolidate post_mime_type code. props scribu. fixes #10992

Location:

trunk/wp-admin

Files:

• includes/media.php (modified) (2 diffs)
• includes/post.php (modified) (2 diffs)
• upload.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -1106 +1106 @@
  */
 function get_media_item( $attachment_id, $args = null ) {
-        global $post_mime_types, $redir_tab;
+        global $redir_tab;
 
         if ( ( $attachment_id = intval($attachment_id) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
@@ -1131 +1131 @@
         }
 
-        $type = '';
-        if ( isset($post_mime_types) ) {
-                $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type));
-                $type = array_shift($keys);
-                $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
-        }
+        $post_mime_types = get_post_mime_types();
+        $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type));
+        $type = array_shift($keys);
+        $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 
         $form_fields = get_attachment_fields_to_edit($post, $errors);

trunk/wp-admin/includes/post.php

@@ -838 +838 @@
 
 /**
+ * Get default post mime types
+ *
+ * @since 2.9.0
+ *
+ * @return array
+ */
+function get_post_mime_types() {
+        $post_mime_types = array(       //      array( adj, noun )
+                'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
+                'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
+                'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
+        );
+
+        return apply_filters('post_mime_types', $post_mime_types);
+}
+
+/**
  * {@internal Missing Short Description}}
  *
@@ -872 +889 @@
                 $media_per_page = 20;
         $q['posts_per_page'] = $media_per_page;
-        $post_mime_types = array(       //      array( adj, noun )
-                                'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
-                                'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
-                                'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
-                        );
-        $post_mime_types = apply_filters('post_mime_types', $post_mime_types);
-
+
+        $post_mime_types = get_post_mime_types();
         $avail_post_mime_types = get_available_post_mime_types('attachment');
 

trunk/wp-admin/upload.php

@@ -147 +147 @@
         }
 
-        $post_mime_types = array(
-                                'image' => array(__('Images'), __('Manage Images'), _n_noop('Image (%s)', 'Images (%s)')),
-                                'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio (%s)', 'Audio (%s)')),
-                                'video' => array(__('Video'), __('Manage Video'), _n_noop('Video (%s)', 'Video (%s)')),
-                        );
-        $post_mime_types = apply_filters('post_mime_types', $post_mime_types);
-
+        $post_mime_types = get_post_mime_types();
         $avail_post_mime_types = get_available_post_mime_types('attachment');