Changeset 34681

Timestamp:

09/29/2015 04:04:16 AM (9 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk

Files:

• src/wp-includes/class-wp-xmlrpc-server.php (modified) (4 diffs)
• tests/phpunit/tests/xmlrpc/mw/editPost.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/mw/newPost.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/wp/editComment.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/wp/newPost.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -1325 +1325 @@
 
         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'] );
         }
 
@@ -3396 +3396 @@
             // 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 );
         }
 
@@ -4961 +4961 @@
 
         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 = '';
@@ -5315 +5315 @@
 
         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'];

trunk/tests/phpunit/tests/xmlrpc/mw/editPost.php

@@ -230 +230 @@
         $this->assertEquals( $result->code, 401 );
     }
+
+    /**
+     * @ticket 30429
+     */
+    function test_post_date_timezone_conversion() {
+        $tz = get_option( 'timezone_string' );
+        update_option( 'timezone_string', 'America/New_York' );
+
+        $editor_id = $this->make_user_by_role( 'editor' );
+
+        $post_id = $this->factory->post->create( array(
+            'post_author' => $editor_id
+        ) );
+
+        $date_string = '1984-01-11 05:00:00';
+        $result = $this->myxmlrpcserver->mw_editPost( array( $post_id, 'editor', 'editor', array(
+            'dateCreated' => new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date_string, false ) ),
+        ) ) );
+
+        $fetched_post = get_post( $post_id );
+
+        update_option( 'timezone_string', $tz );
+
+        $this->assertTrue( $result );
+        $this->assertEquals( $date_string, $fetched_post->post_date );
+    }
 }

trunk/tests/phpunit/tests/xmlrpc/mw/newPost.php

@@ -181 +181 @@
         $this->assertEquals( '0000-00-00 00:00:00', $out->post_date_gmt );
     }
+
+    /**
+     * @ticket 30429
+     */
+    function test_post_date_timezone_conversion() {
+        $tz = get_option( 'timezone_string' );
+        update_option( 'timezone_string', 'America/New_York' );
+
+        $this->make_user_by_role( 'editor' );
+        $date_string = '1984-01-11 05:00:00';
+        $post = array(
+            'title' => 'test',
+            'post_content' => 'test',
+            'dateCreated' => new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date_string, false ) )
+        );
+        $result = $this->myxmlrpcserver->mw_newPost( array( 1, 'editor', 'editor', $post ) );
+        $fetched_post = get_post( $result );
+
+        update_option( 'timezone_string', $tz );
+
+        $this->assertStringMatchesFormat( '%d', $result );
+        $this->assertEquals( $date_string , $fetched_post->post_date );
+    }
 }

trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php

@@ -70 +70 @@
         $this->assertEquals( 'trash', get_comment( $comment_id )->comment_approved );
     }
+
+    /**
+     * @ticket 30429
+     */
+    function test_post_date_timezone_conversion() {
+        $tz = get_option( 'timezone_string' );
+        update_option( 'timezone_string', 'America/New_York' );
+
+        $this->make_user_by_role( 'administrator' );
+        $post_id = $this->factory->post->create();
+
+        $comment_data = array(
+            'comment_post_ID' => $post_id,
+            'comment_author' => 'Test commenter',
+            'comment_author_url' => 'http://example.com/',
+            'comment_author_email' => 'example@example.com',
+            'comment_content' => rand_str( 100 ),
+            'comment_approved' => '1',
+        );
+        $comment_id = wp_insert_comment( $comment_data );
+
+        $date_string = '1984-01-11 05:00:00';
+        $result = $this->myxmlrpcserver->wp_editComment( array( 1, 'administrator', 'administrator', $comment_id, array(
+            'date_created_gmt' => new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date_string, false ) )
+        ) ) );
+        $fetched_comment = get_comment( $comment_id );
+
+        update_option( 'timezone_string', $tz );
+
+        $this->assertTrue( $result );
+        $this->assertEquals( $date_string, $fetched_comment->comment_date );
+    }
 }

trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php

@@ -384 +384 @@
     }
 
+    /**
+     * @ticket 30429
+     */
+    function test_post_date_timezone_conversion() {
+        $tz = get_option( 'timezone_string' );
+        update_option( 'timezone_string', 'America/New_York' );
+
+        $this->make_user_by_role( 'author' );
+        $date_string = '1984-01-11 05:00:00';
+        $post = array( 'post_title' => 'test', 'post_content' => 'test', 'post_date' => $date_string );
+        $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'author', 'author', $post ) );
+        $fetched_post = get_post( $result );
+
+        update_option( 'timezone_string', $tz );
+
+        $this->assertStringMatchesFormat( '%d', $result );
+        $this->assertEquals( $date_string , $fetched_post->post_date );
+    }
 }