From 0f8ba2cf2a004217a379e3dfea942a0ffe89688e Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 19 Aug 2019 15:16:18 +0000 Subject: [PATCH] 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 --- src/wp-includes/class-wp-date-query.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/wp-includes/class-wp-date-query.php b/src/wp-includes/class-wp-date-query.php index 716b44215e..2f7ef7e28c 100644 --- a/src/wp-includes/class-wp-date-query.php +++ b/src/wp-includes/class-wp-date-query.php @@ -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 {