Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Date/Time: In WP_Date_Query::__construct(), return early if `$date_…
…query` is empty or not an array.

Props vishalkakadiya.
Fixes #47392.

git-svn-id: https://develop.svn.wordpress.org/trunk@45850 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
SergeyBiryukov committed Aug 19, 2019
1 parent 4e0499e commit 0f8ba2c
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions src/wp-includes/class-wp-date-query.php
Expand Up @@ -145,25 +145,21 @@ class WP_Date_Query {
* 'comment_date', 'comment_date_gmt'.
*/
public function __construct( $date_query, $default_column = 'post_date' ) {
if ( empty( $date_query ) || ! is_array( $date_query ) ) {
return;
}

if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
$this->relation = 'OR';
} else {
$this->relation = 'AND';
}

if ( ! is_array( $date_query ) ) {
return;
}

// Support for passing time-based keys in the top level of the $date_query array.
if ( ! isset( $date_query[0] ) && ! empty( $date_query ) ) {
if ( ! isset( $date_query[0] ) ) {
$date_query = array( $date_query );
}

if ( empty( $date_query ) ) {
return;
}

if ( ! empty( $date_query['column'] ) ) {
$date_query['column'] = esc_sql( $date_query['column'] );
} else {
Expand Down

0 comments on commit 0f8ba2c

Please sign in to comment.