Ticket #17019: 17019.diff

wp-admin/includes/class-wp-media-list-table.php

@@ -46 +46 @@
                 $type_links = array();
                 $_num_posts = (array) wp_count_attachments();
                 $_total_posts = array_sum($_num_posts) - $_num_posts['trash'];
-                if ( !isset( $total_orphans ) )
-                                $total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
+                if ( !isset( $total_orphans ) ) {
+                        $args = array( 
+                                'fields' => 'count',
+                                'post_type' => 'attachment', 
+                                'post_status' => 'any', 
+                                'post_parent' => 0,
+                                'suppress_filters' => false,
+                                'query_context' => 'attachment_orphans_count',
+                        );
+                        
+                        $total_orphans = intval( get_posts( $args ) );
+                }
+
                 $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
                 foreach ( $matches as $type => $reals )
                         foreach ( $reals as $real )

wp-admin/includes/media.php

@@ -42 +42 @@
 
         $post_id = intval($_REQUEST['post_id']);
 
-        if ( $post_id )
-                $attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) );
+        if ( $post_id ) {
+                $args = array( 
+                        'fields' => 'count',
+                        'post_type' => 'attachment',
+                        'post_status' => 'any',
+                        'post_parent' => $post_id,
+                        'suppress_filters' => false,
+                        'query_context' => 'gallery_attachment_count',
+                );
 
+                $attachments = intval( get_posts( $args ) );
+        }
+                
         if ( empty($attachments) ) {
                 unset($tabs['gallery']);
                 return $tabs;

wp-includes/query.php

@@ -1369 +1378 @@
                         , 's'
                         , 'sentence'
                         , 'fields'
+                        , 'query_context'
                 );
 
                 foreach ( $keys as $key ) {
@@ -2001 +2013 @@
                         case 'id=>parent':
                                 $fields = "$wpdb->posts.ID, $wpdb->posts.post_parent";
                                 break;
+                        case 'count':
+                                $fields = "COUNT(*)";
+                                break;
                         default:
                                 $fields = "$wpdb->posts.*";
                 }
@@ -2610 +2625 @@
 
                         return $r;
                 }
+                
+                if ( 'count' == $q['fields'] ) {
+                        $this->posts = $wpdb->get_var($this->request);
 
+                        return $this->posts;
+                }
+
                 $this->posts = $wpdb->get_results($this->request);
 
                 // Raw results filter.  Prior to status checks.