Ticket #17019: 170195.6.diff

Index: /src/wp-admin/includes/media.php
===================================================================
--- /src/wp-admin/includes/media.php    (revisione 37161)
+++ /src/wp-admin/includes/media.php    (copia locale)
@@ -42,8 +42,6 @@
  * @return array $tabs with gallery if post has image attachment
  */
 function update_gallery_tab($tabs) {
-       global $wpdb;
-
        if ( !isset($_REQUEST['post_id']) ) {
                unset($tabs['gallery']);
                return $tabs;
@@ -51,8 +49,17 @@
 
        $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 = (int) get_posts( $args ); 
+       }
 
        if ( empty($attachments) ) {
                unset($tabs['gallery']);
Index: /src/wp-includes/query.php
===================================================================
--- /src/wp-includes/query.php  (revisione 37161)
+++ /src/wp-includes/query.php  (copia locale)
@@ -1439,6 +1439,7 @@
                        , 'fields'
                        , 'menu_order'
                        , 'embed'
+                       , 'query_context' 
                );
 
                foreach ( $keys as $key ) {
@@ -2613,6 +2614,9 @@
                        case 'id=>parent':
                                $fields = "$wpdb->posts.ID, $wpdb->posts.post_parent";
                                break;
+                  case 'count': 
+                           $fields = "COUNT(*)"; 
+                         break; 
                        default:
                                $fields = "$wpdb->posts.*";
                }
@@ -3568,6 +3572,12 @@
 
                        return $r;
                }
+            
+               if ( 'count' == $q['fields'] ) { 
+                   $this->posts = array(); 
+                   $this->post_count = $wpdb->get_var( $this->request ); 
+                   return $this->post_count; 
+               }
 
                $split_the_query = ( $old_request == $this->request && "$wpdb->posts.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
Index: tests/phpunit/tests/query.php
===================================================================
--- tests/phpunit/tests/query.php       (revisione 37195)
+++ tests/phpunit/tests/query.php       (copia locale)
@@ -562,4 +562,44 @@
                $this->assertSame( 'tax1', get_query_var( 'taxonomy' ) );
                $this->assertSame( 'term1', get_query_var( 'term' ) );
        }
+       
+       /**
+        * @ticket 17019
+        */
+       public function test_fields_count() {
+               $this->factory->post->create_many( 3 );
+
+               $q = new WP_Query( array( 'fields' => 'count' ) );
+               $this->assertNotEquals( 3, $q->posts );
+               $this->assertEquals( 3, $q->post_count );
+
+               $p = get_posts( array( 'fields' => 'count' ) );
+               $this->assertEquals( 3, $p );
+       }
+
+       public function test_query_context() {
+               $this->factory->post->create_many( 5 );
+
+               $q = new WP_Query( array( 'post_type' => 'post' ) );
+               $this->assertEquals( 5, $q->post_count );
+
+               add_action( 'pre_get_posts', array( $this, 'filter_pre_get_posts' ) );
+
+               $q = new WP_Query( array( 'query_context' => 'burrito' ) );
+               $this->assertEquals( 3, $q->post_count );
+
+               $q = new WP_Query( array( 'query_context' => 'taco' ) );
+               $this->assertEquals( 5, $q->post_count );
+
+               remove_action( 'pre_get_posts', array( $this, 'filter_pre_get_posts' ) );
+
+               $q = new WP_Query( array( 'query_context' => 'burrito' ) );
+               $this->assertEquals( 5, $q->post_count );
+       }
+
+       public function filter_pre_get_posts( &$query ) {
+               if ( 'burrito' === $query->get( 'query_context' ) ) {
+                       $query->set( 'posts_per_page', 3 );
+               }
+       }
 }