Ticket #35075: 35075.diff

src/wp-includes/class-wp-comment-query.php

@@ -365 +365 @@
                         $this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
                 }
 
-                // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
-                $key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
+                $key = md5( serialize( $this->query_vars ) );
                 $last_changed = wp_cache_get( 'last_changed', 'comment' );
                 if ( ! $last_changed ) {
                         $last_changed = microtime();

src/wp-includes/post.php

@@ -4401 +4401 @@
                 return false;
         }
 
-        // $args can be whatever, only use the args defined in defaults to compute the key.
-        $key = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
+        $key = md5( serialize( $r ) );
         $last_changed = wp_cache_get( 'last_changed', 'posts' );
         if ( ! $last_changed ) {
                 $last_changed = microtime();

src/wp-includes/taxonomy.php

@@ -1492 +1492 @@
 
         $query = "SELECT $distinct $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
 
-        // $args can be anything. Only use the args defined in defaults to compute the key.
-        $key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $defaults ) ) ) . serialize( $taxonomies ) . $query );
+        $key = md5( serialize( $args ) . serialize( $taxonomies ) . $query );
         $last_changed = wp_cache_get( 'last_changed', 'terms' );
         if ( ! $last_changed ) {
                 $last_changed = microtime();

tests/phpunit/tests/comment/query.php

@@ -1676 +1676 @@
 
         /**
          * @ticket 22400
+         * @ticket 35075
          */
-        public function test_comment_cache_key_should_ignore_custom_params() {
+        public function test_comment_cache_key_should_not_ignore_custom_query_vars() {
                 global $wpdb;
 
                 $p = self::factory()->post->create();
@@ -1698 +1699 @@
                         'foo' => 'bar',
                 ) );
 
-                $this->assertSame( $num_queries, $wpdb->num_queries );
+                $this->assertNotEquals( $num_queries, $wpdb->num_queries );
         }
 
         /**

tests/phpunit/tests/post/getPages.php

@@ -334 +334 @@
 
         }
 
+        /**
+         * @ticket 35075
+         */
+        public function test_cache_key_should_not_ignore_custom_query_vars() {
+                global $wpdb;
+
+                $page_id = self::factory()->post->create( array('post_type' => 'page') );
+
+                $p1 = get_pages( array(
+                        'include' => $page_id,
+                ) );
+
+                $num_queries = $wpdb->num_queries;
+
+                $p1 = get_pages( array(
+                        'include' => $page_id,
+                        'foo'     => 'bar',
+                ) );
+
+                $this->assertNotEquals( $num_queries, $wpdb->num_queries );
+        }
+
         function test_wp_list_pages_classes() {
                 $type = 'taco';
                 register_post_type( $type, array( 'hierarchical' => true, 'public' => true ) );

tests/phpunit/tests/term/getTerms.php

@@ -1665 +1665 @@
 
         }
 
+        /**
+         * @ticket 35075
+         */
+        public function test_cache_key_should_not_ignore_custom_query_vars() {
+                global $wpdb;
+
+                $term_id = self::factory()->term->create( array( 'taxonomy' => 'category' ) );
+
+                $t1 = get_terms( 'category', array(
+                        'include' => $term_id,
+                        'fields'  => 'ids',
+                ) );
+
+                $num_queries = $wpdb->num_queries;
+
+                $t2 = get_terms( 'category', array(
+                        'include' => $term_id,
+                        'fields'  => 'ids',
+                        'foo'     => 'bar',
+                ) );
+
+                $this->assertNotEquals( $num_queries, $wpdb->num_queries );
+        }
+
         protected function create_hierarchical_terms_and_posts() {
                 $terms = array();