From 111c05ba47843d4976df0446324d49ad837cc61e Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 29 Sep 2015 04:05:24 +0000
Subject: [PATCH] XML-RPC: calculate the proper offset for GMT in `wp.newPost`,
 `mw.newPost`, and `mw.editPost` when `post_date` is set, `wp.editComment`
 when `comment_date` is set. `post|comment_date` is assumed to be GMT. This is
 only true if the timezone string for the site matches GMT.

Adds unit tests for each.

Props smerriman, justdaiv, wonderboymusic.
Fixes #30429.

Built from https://develop.svn.wordpress.org/trunk@34681


git-svn-id: http://core.svn.wordpress.org/trunk@34645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-xmlrpc-server.php | 16 ++++++++--------
 wp-includes/version.php                |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 8661a44b4c..6eadaf8bbb 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -1324,8 +1324,8 @@ class wp_xmlrpc_server extends IXR_Server {
 		}
 
 		if ( ! empty( $dateCreated ) ) {
-			$post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
-			$post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
+			$post_data['post_date'] = iso8601_to_datetime( $dateCreated );
+			$post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
 		}
 
 		if ( ! isset( $post_data['ID'] ) )
@@ -3395,8 +3395,8 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( !empty( $content_struct['date_created_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
 			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-			$comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-			$comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+			$comment_date = iso8601_to_datetime( $dateCreated );
+			$comment_date_gmt = get_gmt_from_date( $comment_date );
 		}
 
 		if ( isset($content_struct['content']) )
@@ -4960,8 +4960,8 @@ class wp_xmlrpc_server extends IXR_Server {
 			$dateCreated = $content_struct['dateCreated']->getIso();
 
 		if ( !empty( $dateCreated ) ) {
-			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+			$post_date = iso8601_to_datetime( $dateCreated );
+			$post_date_gmt = get_gmt_from_date( $post_date );
 		} else {
 			$post_date = '';
 			$post_date_gmt = '';
@@ -5314,8 +5314,8 @@ class wp_xmlrpc_server extends IXR_Server {
 			$dateCreated = $content_struct['dateCreated']->getIso();
 
 		if ( !empty( $dateCreated ) ) {
-			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+			$post_date = iso8601_to_datetime( $dateCreated );
+			$post_date_gmt = get_gmt_from_date( $post_date, 'GMT' );
 		} else {
 			$post_date     = $postdata['post_date'];
 			$post_date_gmt = $postdata['post_date_gmt'];
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 739087b756..7724c663ba 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34680';
+$wp_version = '4.4-alpha-34681';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.