Changeset 45876 for trunk/src/wp-includes/class-wp-date-query.php

Timestamp:

08/22/2019 03:10:05 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Use wp_timezone() in WP_Date_Query::build_mysql_datetime() to address timezone issues.

Improve unit test coverage.

Props Rarst, Biranit, birgire, jave.web, SergeyBiryukov.
Fixes #41782.

File:

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

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

@@ -854 +854 @@
      * You can pass an array of values (year, month, etc.) with missing parameter values being defaulted to
      * either the maximum or minimum values (controlled by the $default_to parameter). Alternatively you can
-     * pass a string that will be run through strtotime().
+     * pass a string that will be passed to date_create().
      *
      * @since 3.7.0
@@ -866 +866 @@
      */
     public function build_mysql_datetime( $datetime, $default_to_max = false ) {
-        $now = current_time( 'timestamp' );
-
         if ( ! is_array( $datetime ) ) {
 
@@ -908 +906 @@
             // If no match is found, we don't support default_to_max.
             if ( ! is_array( $datetime ) ) {
-                // @todo Timezone issues here possibly
-                return gmdate( 'Y-m-d H:i:s', strtotime( $datetime, $now ) );
+                $wp_timezone = wp_timezone();
+
+                // Assume local timezone if not provided.
+                $dt = date_create( $datetime, $wp_timezone );
+
+                if ( false === $dt ) {
+                    return gmdate( 'Y-m-d H:i:s', false );
+                }
+
+                return $dt->setTimezone( $wp_timezone )->format( 'Y-m-d H:i:s' );
             }
         }
@@ -916 +922 @@
 
         if ( ! isset( $datetime['year'] ) ) {
-            $datetime['year'] = gmdate( 'Y', $now );
+            $datetime['year'] = current_time( 'Y' );
         }