Changeset 54561 for branches/4.6/src/wp-includes/date.php
- Timestamp:
- 10/17/2022 06:03:41 PM (2 years ago)
- Location:
- branches/4.6
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.6
- Property svn:mergeinfo changed
/trunk merged: 54521-54523,54525-54527,54529-54530,54541
- Property svn:mergeinfo changed
-
branches/4.6/src/wp-includes/date.php
r37518 r54561 153 153 public function __construct( $date_query, $default_column = 'post_date' ) { 154 154 155 if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] )) {156 $this->relation = 'OR';155 if ( isset( $date_query['relation'] ) ) { 156 $this->relation = $this->sanitize_relation( $date_query['relation'] ); 157 157 } else { 158 158 $this->relation = 'AND'; … … 233 233 $this->validate_date_values( $queries ); 234 234 } 235 236 // Sanitize the relation parameter. 237 $queries['relation'] = $this->sanitize_relation( $queries['relation'] ); 235 238 236 239 foreach ( $queries as $key => $q ) { … … 1016 1019 return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time ); 1017 1020 } 1021 1022 /** 1023 * Sanitizes a 'relation' operator. 1024 * 1025 * @since 6.0.3 1026 * 1027 * @param string $relation Raw relation key from the query argument. 1028 * @return string Sanitized relation ('AND' or 'OR'). 1029 */ 1030 public function sanitize_relation( $relation ) { 1031 if ( 'OR' === strtoupper( $relation ) ) { 1032 return 'OR'; 1033 } else { 1034 return 'AND'; 1035 } 1036 } 1018 1037 }
Note: See TracChangeset
for help on using the changeset viewer.