<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36164] branches/4.4: XML-RPC: Revert [34681] as it broke date handling.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36164">36164</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36164","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nacin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-03 19:49:34 +0000 (Sun, 03 Jan 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>XML-RPC: Revert <a href="https://core.trac.wordpress.org/changeset/34681">[34681]</a> as it broke date handling.
Merges <a href="https://core.trac.wordpress.org/changeset/36163">[36163]</a> to the 4.4 branch.
props dossy, hnle, redsweater.
see <a href="https://core.trac.wordpress.org/ticket/35053">#35053</a>, <a href="https://core.trac.wordpress.org/ticket/30429">#30429</a> (original ticket).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches44srcwpincludesclasswpxmlrpcserverphp">branches/4.4/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#branches44testsphpunittestsxmlrpcmweditPostphp">branches/4.4/tests/phpunit/tests/xmlrpc/mw/editPost.php</a></li>
<li><a href="#branches44testsphpunittestsxmlrpcmwnewPostphp">branches/4.4/tests/phpunit/tests/xmlrpc/mw/newPost.php</a></li>
<li><a href="#branches44testsphpunittestsxmlrpcwpeditCommentphp">branches/4.4/tests/phpunit/tests/xmlrpc/wp/editComment.php</a></li>
<li><a href="#branches44testsphpunittestsxmlrpcwpnewPostphp">branches/4.4/tests/phpunit/tests/xmlrpc/wp/newPost.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches44">branches/4.4/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.4
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.4 2016-01-03 19:48:07 UTC (rev 36163)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.4 2016-01-03 19:49:34 UTC (rev 36164)
</ins><a id="branches44"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.4</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,35802,35823,35825-35826,35829,35832-35834,35837,35839,35850,35876,35880,35897,35922,35931,35933,35943-35944,35978,35994,36003,36005,36007,36038,36040,36042,36045,36048,36056,36068,36081,36089,36094,36096-36097,36100,36108,36110,36117,36119-36121,36123,36130,36132,36134,36137,36141,36154,36157
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,35802,35823,35825-35826,35829,35832-35834,35837,35839,35850,35876,35880,35897,35922,35931,35933,35943-35944,35978,35994,36003,36005,36007,36038,36040,36042,36045,36048,36056,36068,36081,36089,36094,36096-36097,36100,36108,36110,36117,36119-36121,36123,36130,36132,36134,36137,36141,36154,36157,36163
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches44srcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/src/wp-includes/class-wp-xmlrpc-server.php 2016-01-03 19:48:07 UTC (rev 36163)
+++ branches/4.4/src/wp-includes/class-wp-xmlrpc-server.php 2016-01-03 19:49:34 UTC (rev 36164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1349,8 +1349,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $dateCreated ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_data['post_date'] = iso8601_to_datetime( $dateCreated );
- $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+ $post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $post_data['ID'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3423,8 +3423,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $content_struct['date_created_gmt'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We know this is supposed to be GMT, so we're going to slap that Z on there by force
</span><span class="cx" style="display: block; padding: 0 10px"> $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_date = iso8601_to_datetime( $dateCreated );
- $comment_date_gmt = get_gmt_from_date( $comment_date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
+ $comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($content_struct['content']) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4991,8 +4991,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dateCreated = $content_struct['dateCreated']->getIso();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $dateCreated ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_date = iso8601_to_datetime( $dateCreated );
- $post_date_gmt = get_gmt_from_date( $post_date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
+ $post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5345,8 +5345,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dateCreated = $content_struct['dateCreated']->getIso();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $dateCreated ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_date = iso8601_to_datetime( $dateCreated );
- $post_date_gmt = get_gmt_from_date( $post_date, 'GMT' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
+ $post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date = $postdata['post_date'];
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = $postdata['post_date_gmt'];
</span></span></pre></div>
<a id="branches44testsphpunittestsxmlrpcmweditPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/tests/phpunit/tests/xmlrpc/mw/editPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/tests/phpunit/tests/xmlrpc/mw/editPost.php 2016-01-03 19:48:07 UTC (rev 36163)
+++ branches/4.4/tests/phpunit/tests/xmlrpc/mw/editPost.php 2016-01-03 19:49:34 UTC (rev 36164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,32 +220,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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 = self::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 );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16980
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_empty_not_null() {
</span></span></pre></div>
<a id="branches44testsphpunittestsxmlrpcmwnewPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/tests/phpunit/tests/xmlrpc/mw/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/tests/phpunit/tests/xmlrpc/mw/newPost.php 2016-01-03 19:48:07 UTC (rev 36163)
+++ branches/4.4/tests/phpunit/tests/xmlrpc/mw/newPost.php 2016-01-03 19:49:34 UTC (rev 36164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,27 +170,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'draft', $out->post_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0000-00-00 00:00:00', $out->post_date_gmt );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @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 );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches44testsphpunittestsxmlrpcwpeditCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/tests/phpunit/tests/xmlrpc/wp/editComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/tests/phpunit/tests/xmlrpc/wp/editComment.php 2016-01-03 19:48:07 UTC (rev 36163)
+++ branches/4.4/tests/phpunit/tests/xmlrpc/wp/editComment.php 2016-01-03 19:49:34 UTC (rev 36164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,36 +69,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'trash', get_comment( $comment_id )->comment_approved );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @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 = self::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 );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="branches44testsphpunittestsxmlrpcwpnewPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/tests/phpunit/tests/xmlrpc/wp/newPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/tests/phpunit/tests/xmlrpc/wp/newPost.php 2016-01-03 19:48:07 UTC (rev 36163)
+++ branches/4.4/tests/phpunit/tests/xmlrpc/wp/newPost.php 2016-01-03 19:49:34 UTC (rev 36164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,22 +373,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $date_string , $fetched_post->post_date_gmt );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * @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 );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>