Changeset 54530

Timestamp:

10/17/2022 11:47:41 AM (22 months ago)

Author:

audrasjb

Message:

Query: Validate relation in WP_Date_Query.

Props dd32, johnjamesjacoby, martinkrcho, ehtis, paulkevan, peterwilsoncc.

Location:

trunk

Files:

• src/wp-includes/class-wp-date-query.php (modified) (3 diffs)
• tests/phpunit/tests/date/query.php (modified) (1 diff)
• tests/phpunit/tests/term/taxQuery.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-date-query.php

@@ -151 +151 @@
         }
 
-        if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
-            $this->relation = 'OR';
+        if ( isset( $date_query['relation'] ) ) {
+            $this->relation = ;
         } else {
             $this->relation = 'AND';
@@ -220 +220 @@
             $this->validate_date_values( $queries );
         }
+
+
+
 
         foreach ( $queries as $key => $q ) {
@@ -1042 +1045 @@
         return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/date/query.php

@@ -1146 +1146 @@
         $this->assertSame( array( $p1, $p2 ), $q->posts );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/term/taxQuery.php

@@ -336 +336 @@
     /**
      * @ticket 18105
+
      */
     public function test_get_sql_relation_and_operator_in() {
@@ -382 +383 @@
         $this->assertSame( 3, substr_count( $sql['join'], 'JOIN' ) );
 
+
+
+
+
+
         _unregister_taxonomy( 'wptests_tax' );
     }
@@ -387 +393 @@
     /**
      * @ticket 18105
+
      */
     public function test_get_sql_nested_relation_or_operator_in() {
@@ -435 +442 @@
 
         $this->assertSame( 2, substr_count( $sql['join'], 'JOIN' ) );
+
+
 
         _unregister_taxonomy( 'wptests_tax' );
@@ -496 +505 @@
         _unregister_taxonomy( 'wptests_tax' );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }