Ticket #40653: 40653.2.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_string = 'UTC';
+        } else {
+                $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';
+                        }
+                }
+        }
+
+        // There is no way to handle offsets using DateTimeZone in PHP <= 5.4.
+        if ( $timezone_string ) {
+                $timezone = timezone_open( $timezone_string );
+                $datetime = date_create( 'now', $timezone );
+                $date     = $datetime->format( $format );
+        } else {
+                $date = date( $format, time() - $offset * HOUR_IN_SECONDS );
+        }
+
+        if ( 'U' === $format ) {
+                $date = (int) $date;
+        }
+
+        return $date;
 }
 
 /**