Ticket #40653: 40653.diff

src/wp-includes/functions.php

@@ -59 +59 @@
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
 function current_time( $type, $gmt = 0 ) {
+        // Special handling for legacy offset timestamps.
+        if ( 'timestamp' === $type && ! $gmt ) {
+                return time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+        }
+
         switch ( $type ) {
                 case 'mysql':
-                        return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );
+                        $format ='Y-m-d H:i:s';
                 case 'timestamp':
-                        return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+                        $format = 'U';
                 default:
-                        return ( $gmt ) ? date( $type ) : date( $type, time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
+                        $format = $type;
         }
+
+        if ( $gmt ) {
+                $timezone = timezone_open( 'UTC' );
+        } else {
+                $timezone = wp_get_site_timezone();
+        }
+
+        $datetime = date_create( 'now', $timezone );
+        return $datetime->format( $format );
 }
 
 /**
+ * Creates a `DateTimeZone` object for the site's timezone.
+ *
+ * This function determines the site timezone as follows:
+ *
+ * - If the site uses a timezone identifier (i.e., 'timezone_string' option is set),
+ *   that is used.
+ * - If that's not set, we make up an identifier based on the 'gmt_offset'.
+ * - If the GMT offset is 0, or the identifier is invalid, UTC is used.
+ *
+ * @see https://wordpress.stackexchange.com/a/198453/27757
+ * @see https://us.php.net/manual/en/timezones.others.php
+ *
+ * @since 4.8.0
+ *
+ * @return DateTimeZone The site's timezone.
+ */
+function wp_get_site_timezone() {
+        $timezone_string = get_option( 'timezone_string' );
+
+        // A direct offset may be used instead of a timezone identifier.
+        if ( empty( $timezone_string ) ) {
+                $offset = get_option( 'gmt_offset' );
+
+                if ( empty( $offset ) ) {
+                        $timezone_string = 'UTC';
+                } else {
+                        $hours   = (int) $offset;
+                        $minutes = ( $offset - floor( $offset ) ) * 60;
+                        $timezone_string = sprintf( '%+03d:%02d', $hours, $minutes );
+                }
+        }
+
+        return new DateTimeZone( $timezone_string );
+}
+
+/**
  * Retrieve the date in localized format, based on timestamp.
  *
  * If the locale specifies the locale month and weekday, then the locale will