#85 - added timezone parameter to WP_JSON_DateTime::createFromFormat()

lib/class-wp-json-datetime.php

@@ -1,21 +1,30 @@
 <?php
-class WP_JSON_DateTime extends DateTime
-{
-    /**
-     * Workaround for DateTime::createFromFormat on PHP > 5.2
-     * Found on http://stackoverflow.com/a/17084893/717643
-     *
-     * @param  string       $format   The format that the passed in string should be in.
-     * @param  string       $string   String representing the time.
-     * @param  DateTimeZone $timezone A DateTimeZone object representing the desired time zone.
-     * @return Datetime
-     */
-    public static function createFromFormat($format, $time, $timezone = null)
-    {
-        if ( method_exists('DateTime', 'createFromFormat') ) {
-            return parent::createFromFormat($format, $time, $timezone);
-        }
+/**
+ * DateTime compatibility class
+ *
+ * @package WordPress
+ * @subpackage JSON API
+ * @version 0.9
+ */
+class WP_JSON_DateTime extends DateTime {
+	/**
+	 * Workaround for DateTime::createFromFormat on PHP > 5.2
+	 *
+	 * @link http://stackoverflow.com/a/17084893/717643
+	 *
+	 * @param  string       $format   The format that the passed in string should be in.
+	 * @param  string       $string   String representing the time.
+	 * @param  DateTimeZone $timezone A DateTimeZone object representing the desired time zone.
+	 * @return Datetime
+	 */
+	public static function createFromFormat($format, $time, $timezone = null ) {
+		if ( is_null( $timezone ) ) {
+			$timezone = new DateTimeZone( date_default_timezone_get() );
+		}
+		if ( method_exists( 'DateTime', 'createFromFormat' ) ) {
+			return parent::createFromFormat( $format, $time, $timezone );
+		}
 
-        return new DateTime(date($format, strtotime($time)), $timezone);
-    }
+		return new DateTime( date( $format, strtotime( $time ) ), $timezone );
+	}
 }

lib/class-wp-json-server.php

@@ -700,7 +700,7 @@ public function parse_date( $date, $force_utc = false ) {
 		if ( strpos( $date, '.' ) !== false ) {
 			$date = preg_replace( '/\.\d+/', '', $date );
 		}
-		$datetime = WP_JSON_DateTime::createFromFormat( DateTime::RFC3339, $date );
+		$datetime = WP_JSON_DateTime::createFromFormat( DateTime::RFC3339, $date, $timezone );
 
 		return $datetime;
 	}