Changeset 28194

Timestamp:

04/24/2014 11:54:31 AM (9 years ago)

Author:

johnbillion

Message:

Remove some unnecessary abstraction introduced in [28191]. See #27985.

Location:

trunk/src/wp-includes

Files:

• media.php (modified) (3 diffs)
• post.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -2657 +2657 @@
         return;
 
-    global $content_width;
+    global $content_width, $wpdb;
 
     $defaults = array(
@@ -2695 +2695 @@
         }
     }
+
+    $has_audio = $wpdb->get_var( "
+        SELECT ID
+        FROM $wpdb->posts
+        WHERE post_type = 'attachment'
+        AND post_mime_type LIKE 'audio%'
+        LIMIT 1
+    " );
+    $has_video = $wpdb->get_var( "
+        SELECT ID
+        FROM $wpdb->posts
+        WHERE post_type = 'attachment'
+        AND post_mime_type LIKE 'video%'
+        LIMIT 1
+    " );
 
     $settings = array(
@@ -2710 +2725 @@
         'defaultProps' => $props,
         'attachmentCounts' => array(
-            'audio' => wp_has_mime_type_attachments( 'audio' ) ? 1 : 0,
-            'video' => wp_has_mime_type_attachments( 'video' ) ? 1 : 0
+            'audio' => ( $has_audio ) ? 1 : 0,
+            'video' => ( $has_video ) ? 1 : 0
         ),
         'embedExts'    => $exts,

trunk/src/wp-includes/post.php

@@ -2293 +2293 @@
 
 /**
- * Determine if at least one attachment of a particular mime-type has been uploaded
- *
- * @global wpdb $wpdb
- *
- * @since 3.9.1
- *
- * @param string $mime_type The mime-type string to check.
- *
- * @return int|null If exist, the post ID of the first found attachment.
- */
-function wp_has_mime_type_attachments( $mime_type ) {
-    global $wpdb;
-    $sql = sprintf( "SELECT ID FROM $wpdb->posts WHERE post_type = 'attachment' AND post_mime_type LIKE '%s%%' LIMIT 1", like_escape( $mime_type ) );
-    return $wpdb->get_var( $sql );
-}
-
-/**
  * Get default post mime types
  *