From 34f36995f27f834a40550a3eec9d3b10fbacd5bc Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 26 Oct 2009 17:56:28 +0000
Subject: [PATCH] Consolidate post_mime_type code. props scribu. fixes #10992

git-svn-id: http://svn.automattic.com/wordpress/trunk@12110 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/media.php | 12 +++++-------
 wp-admin/includes/post.php  | 24 ++++++++++++++++++------
 wp-admin/upload.php         |  8 +-------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 5d30088e30..5844e5c960 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1105,7 +1105,7 @@ function get_media_items( $post_id, $errors ) {
  * @return string HTML form for attachment.
  */
 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 ) )
 		$thumb_url = $thumb_url[0];
@@ -1130,12 +1130,10 @@ function get_media_item( $attachment_id, $args = null ) {
 		$tags = esc_attr(join(', ', $tags));
 	}
 
-	$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);
 
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 92867e7dbc..75dee30fe5 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -836,6 +836,23 @@ function wp_edit_posts_query( $q = false ) {
 	return array($post_stati, $avail_post_stati);
 }
 
+/**
+ * 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}}
  *
@@ -871,13 +888,8 @@ function wp_edit_attachments_query( $q = false ) {
 	if ( empty($media_per_page) )
 		$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');
 
 	if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) )
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 6180d0b0a6..43c71dddad 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -146,13 +146,7 @@ if ( isset($_GET['detached']) ) {
 		$page_links_total = ceil($wpdb->get_var( "SELECT FOUND_ROWS()" ) / 25);
 	}
 
-	$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');
 
 	if ( isset($_GET['post_mime_type']) && !array_intersect( (array) $_GET['post_mime_type'], array_keys($post_mime_types) ) )