Ticket #40653: current-time2.patch

src/wp-includes/functions.php

@@ -49 +49 @@
  * Retrieve the current time based on specified type.
  *
  * The 'mysql' type will return the time in the format for MySQL DATETIME field.
- * The 'timestamp' type will return the current timestamp.
+ * The 'timestamp' type will return the current timestamp or a sum of timestamp and timezone offset, depending on `$gmt`.
  * Other strings will be interpreted as PHP date formats (e.g. 'Y-m-d').
  *
  * If $gmt is set to either '1' or 'true', then both types will use GMT time.
@@ -60 +60 @@
  * @param string   $type Type of time to retrieve. Accepts 'mysql', 'timestamp', or PHP date
  *                       format string (e.g. 'Y-m-d').
  * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
+ *
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
 function current_time( $type, $gmt = 0 ) {
-        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 ) ) );
-                case 'timestamp':
-                        return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
-                default:
-                        return ( $gmt ) ? gmdate( $type ) : gmdate( $type, time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
+
+        // Don't use non-gmt timestamp, unless you know the difference and really need to.
+        if ( 'timestamp' === $type || 'U' === $type ) {
+                return $gmt ? time() : time() + (int) ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
         }
+
+        if ( 'mysql' === $type ) {
+                $type = 'Y-m-d H:i:s';
+        }
+
+        $timezone = $gmt ? new DateTimeZone( 'UTC' ) : wp_timezone();
+        $datetime = new DateTime( 'now', $timezone );
+
+        return $datetime->format( $type );
 }
 
 /**

tests/phpunit/tests/date/currentTime.php

@@ -21 +21 @@
                 $this->assertEquals( gmdate( $format ), current_time( $format, true ) );
                 $this->assertEquals( $datetime->format( $format ), current_time( $format ) );
         }
+
+        public function test_should_return_wp_timestamp() {
+
+                update_option( 'timezone_string', 'Europe/Kiev' );
+                $timestamp = time();
+                $datetime  = new DateTime( '@' . $timestamp );
+                $datetime->setTimezone( wp_timezone() );
+                $wp_timestamp = $timestamp + $datetime->getOffset();
+
+                $this->assertEquals( $timestamp, current_time( 'timestamp', true ), '', 2 );
+                $this->assertEquals( $timestamp, current_time( 'U', true ), '', 2 );
+                $this->assertEquals( $wp_timestamp, current_time( 'timestamp' ), '', 2 );
+                $this->assertEquals( $wp_timestamp, current_time( 'U' ), '', 2 );
+                $this->assertInternalType( 'int', current_time( 'timestamp' ) );
+        }
+
+        public function test_should_return_correct_local_time() {
+
+                update_option( 'timezone_string', 'Europe/Kiev' );
+                $timestamp      = time();
+                $datetime_local = new DateTime( '@' . $timestamp );
+                $datetime_local->setTimezone( wp_timezone() );
+                $datetime_utc = new DateTime( '@' . $timestamp );
+                $datetime_utc->setTimezone( new DateTimeZone( 'UTC' ) );
+
+                $this->assertEquals( $datetime_local->format( DATE_W3C ), current_time( DATE_W3C ), '', 2 );
+                $this->assertEquals( $datetime_utc->format( DATE_W3C ), current_time( DATE_W3C, true ), '', 2 );
+        }
 }