Changeset 54569 for branches/4.9/src/wp-includes/date.php

Timestamp:

10/17/2022 06:11:47 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Grouped backports to the 4.9 branch.

• Posts, Post types: Apply KSES to post-by-email content,
• General: Validate host on "Are you sure?" screen,
• Posts, Post types: Remove emails from post-by-email logs,
• Media: Refactor search by filename within the admin,
• Pings/trackbacks: Apply KSES to all trackbacks,
• Comments: Apply kses when editing comments,
• Customize: Escape blogname option in underscores templates,
• REST API: Lockdown post parameter of the terms endpoint,
• Mail: Reset PHPMailer properties between use,
• Query: Validate relation in WP_Date_Query,
• Widgets: Escape RSS error messages for display.

Merges [54521], [54522], [54523], [54524], [54525], [54526], [54527], [54528], [54529], [54530], [54541] to the 4.9 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, vortfu, davidbaumwald, tykoted, timothyblynjacobs, johnjamesjacoby, ehtis, matveb, talldanwp.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/date.php (modified) (3 diffs)

branches/4.9/src/wp-includes/date.php

@@ -146 +146 @@
      */
     public function __construct( $date_query, $default_column = 'post_date' ) {
-        if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
-            $this->relation = 'OR';
+        if ( isset( $date_query['relation'] ) ) {
+            $this->relation = $this->sanitize_relation( $date_query['relation'] );
         } else {
             $this->relation = 'AND';
@@ -225 +225 @@
             $this->validate_date_values( $queries );
         }
+
+        // Sanitize the relation parameter.
+        $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
 
         foreach ( $queries as $key => $q ) {
@@ -999 +1002 @@
         return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
     }
+
+    /**
+     * Sanitizes a 'relation' operator.
+     *
+     * @since 6.0.3
+     *
+     * @param string $relation Raw relation key from the query argument.
+     * @return string Sanitized relation ('AND' or 'OR').
+     */
+    public function sanitize_relation( $relation ) {
+        if ( 'OR' === strtoupper( $relation ) ) {
+            return 'OR';
+        } else {
+            return 'AND';
+        }
+    }
 }