Changeset 54562 for branches/5.3/src/wp-includes/class-wp-date-query.php

Timestamp:

10/17/2022 06:03:55 PM (4 years ago)

Author:

audrasjb

Message:

Grouped backports to the 5.3 branch.

• Editor: Bump @wordpress packages for the branch,
• Media: Refactor search by filename within the admin,
• REST API: Lockdown post parameter of the terms endpoint,
• Customize: Escape blogname option in underscores templates,
• Query: Validate relation in WP_Date_Query,
• 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,
• Pings/trackbacks: Apply KSES to all trackbacks,
• Mail: Reset PHPMailer properties between use,
• Comments: Apply kses when editing comments,
• Widgets: Escape RSS error messages for display.

Merges [54521-54530] to the 5.3 branch.
Props audrasjb, costdev, cu121, dd32, davidbaumwald, ehtis, johnbillion, johnjamesjacoby, martinkrcho, matveb, oztaser, paulkevan, peterwilsoncc, ravipatel, SergeyBiryukov, talldanwp, timothyblynjacobs, tykoted, voldemortensen, vortfu, xknown.

Location:

branches/5.3

Files:

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

branches/5.3/src/wp-includes/class-wp-date-query.php

@@ -150 +150 @@
                 }
 
-                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';
@@ -221 +221 @@
                         $this->validate_date_values( $queries );
                 }
+
+                // Sanitize the relation parameter.
+                $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
 
                 foreach ( $queries as $key => $q ) {
@@ -1040 +1043 @@
                 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';
+                }
+        }
 }