Ticket #28636: 28636.6.diff

src/wp-includes/formatting.php

@@ -2343 +2343 @@
 }
 
 /**
+ * Returns a formatted date in the local timezone. This is a drop-in
+ * replacement for `date()`, except that the returned string will be formatted
+ * for the local timezone.
+ *
+ * If there is a timezone_string available, the date is assumed to be in that
+ * timezone, otherwise it simply subtracts the value of the 'gmt_offset'
+ * option.
+ *
+ * @uses get_option() to retrieve the value of 'gmt_offset'.
+ * @param string $format The format of the outputted date string.
+ * @param string $timestamp Optional. If absent, defaults to `time()`.
+ * @return string GMT version of the date provided.
+ */
+function wp_date( $format, $timestamp = false ) {
+        $tz = get_option( 'timezone_string' );
+        if ( ! $timestamp ) {
+                $timestamp = time();
+        }
+        if ( $tz ) {
+                $date = date_create( '@' . $timestamp );
+                if ( ! $date ) {
+                        return gmdate( $format, 0 );
+                }
+                $date->setTimezone( new DateTimeZone( $tz ) );
+                return $date->format( $format );
+        } else {
+                return date( $format, $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
+        }
+}
+
+/**
+ * Converts a locally-formatted date to a unix timestamp. This is a drop-in
+ * replacement for `strtotime()`, except that where strtotime assumes GMT, this
+ * assumes local time (as described below). If a timezone is specified, this
+ * function defers to strtotime().
+ *
+ * If there is a timezone_string available, the date is assumed to be in that
+ * timezone, otherwise it simply subtracts the value of the 'gmt_offset'
+ * option.
+ *
+ * @see strtotime()
+ * @uses get_option() to retrieve the value of 'gmt_offset'.
+ * @param string $string A date/time string. See `strtotime` for valid formats.
+ * @return int UNIX timestamp.
+ */
+function wp_strtotime( $string ) {
+        // If there's a timezone specified, we shouldn't convert it
+        try {
+                $test_date = new DateTime( $string );
+                if ( 'UTC' != $test_date->getTimezone()->getName() ) {
+                        return strtotime( $string );
+                }
+        } catch ( Exception $e ) {
+                return strtotime( $string );
+        }
+
+        $tz = get_option( 'timezone_string' );
+        if ( $tz ) {
+                $date = date_create( $string, new DateTimeZone( $tz ) );
+                if ( ! $date ) {
+                        return strtotime( $string );
+                }
+                $date->setTimezone( new DateTimeZone( 'UTC' ) );
+                return $date->getTimestamp();
+        } else {
+                return strtotime( $string ) - ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+        }
+}
+
+/**
  * Adds a element attributes to open links in new windows.
  *
  * Comment text in popup windows should be filtered through this. Right now it's

tests/phpunit/tests/formatting/date.php

@@ -47 +47 @@
                 $gmt = '2012-06-01 11:34:56';
                 $this->assertEquals( $gmt, get_gmt_from_date( $local ) );
         }
+
+        /**
+         * @ticket 28636
+         */
+        function test_wp_dateis_string() {
+                $format = "Y-m-d H:i:s";
+                $result = wp_date( $format );
+                $this->assertEquals( true, is_string( $result ) );
+        }
+
+        /**
+         * @ticket 28636
+         */
+        function test_wp_strtotime_is_int() {
+                $result = wp_strtotime( 'now' );
+                $this->assertEquals( true, is_int( $result ) );
+        }
 }