Changeset 28854

Timestamp:

06/26/2014 05:42:17 PM (12 years ago)

Author:

SergeyBiryukov

Message:

XML-RPC: Make sure wp.newPost does not produce a fatal error when a post_date field is included in the data.

props dllh.
fixes #28601.

Location:

trunk

Files:

• src/wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/wp/newPost.php (modified) (1 diff)

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

@@ -1103 +1103 @@
                         return $this->error;
 
+                // convert the date field back to IXR form
+                if ( isset( $content_struct['post_date'] ) ) {
+                        $content_struct['post_date'] = $this->_convert_date( $content_struct['post_date'] );
+                }
+
+                // ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
+                // since _insert_post will ignore the non-GMT date if the GMT date is set
+                if ( isset( $content_struct['post_date_gmt'] ) ) {
+                        if ( $content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
+                                unset( $content_struct['post_date_gmt'] );
+                        } else {
+                                $content_struct['post_date_gmt'] = $this->_convert_date( $content_struct['post_date_gmt'] );
+                        }
+                }
+
                 /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
                 do_action( 'xmlrpc_call', 'wp.newPost' );

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

@@ -306 +306 @@
         }
 
+        /**
+         * @ticket 28601
+         */
+        function test_invalid_post_date_does_not_fatal() {
+                $this->make_user_by_role( 'author' );
+                $date_string = '2014-01-01 10:10:10';
+                $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 );
+                $this->assertStringMatchesFormat( '%d', $result );
+        }
+
+        /**
+         * @ticket 28601
+         */
+        function test_invalid_post_date_gmt_does_not_fatal() {
+                $this->make_user_by_role( 'author' );
+                $date_string = 'invalid date';
+                $post = array( 'post_title' => 'test', 'post_content' => 'test', 'post_date_gmt' => $date_string );
+                $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'author', 'author', $post ) );
+                $fetched_post = get_post( $result );
+                $this->assertStringMatchesFormat( '%d', $result );
+        }
+
 }