Changeset 45850

Timestamp:

08/19/2019 03:16:18 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: In WP_Date_Query::__construct(), return early if $date_query is empty or not an array.

Props vishalkakadiya.
Fixes #47392.

File:

• trunk/src/wp-includes/class-wp-date-query.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-date-query.php

@@ -146 +146 @@
      */
     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';
@@ -152 +156 @@
         }
 
-        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;
         }