Ticket #25835: unit-test.25835.diff

src/wp-includes/date.php

@@ -256 +256 @@
 
                 if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) )
                         $where_parts[] = "MONTH( $column ) $compare $value";
-
-                // Legacy
-                if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
+                else if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
                         $where_parts[] = "MONTH( $column ) $compare $value";
 
                 if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) )
                         $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-
-                // Legacy
-                if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
+                else if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
                         $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
 
                 if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )

tests/phpunit/tests/query/dateQuery.php

@@ -555 +555 @@
 
                 $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
         }
+
+        public function test_date_params_monthnum_m_duplicate() {
+                $this->q->query( array(
+                        'date_query' => array(
+                                'month' => 10,
+                                'monthnum' => 11
+                        ),
+                ) );
+
+                $this->assertContains( "AND ( ( MONTH( post_date ) = 10 ) ) AND", $this->q->request );
+
+                $this->assertNotContains( "AND ( ( MONTH( post_date ) = 10 AND MONTH( post_date ) = 11 ) ) AND", $this->q->request );
+        }
+
+        public function test_date_params_week_w_duplicate() {
+                $this->q->query( array(
+                        'date_query' => array(
+                                'week' => 10,
+                                'w' => 11
+                        ),
+                ) );
+
+                $this->assertContains( "AND ( ( WEEK( post_date, 1 ) = 10 ) ) AND", $this->q->request );
+
+                $this->assertNotContains( "AND ( ( WEEK( post_date, 1 ) = 10 AND WEEK( post_date, 1 ) = 11 ) ) AND", $this->q->request );
+        }
 }
+ No newline at end of file