<!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>[56802] trunk: Quick/Bulk Edit: Fix inability to quick edit draft post date.</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 { white-space: pre-line; 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/56802">56802</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/56802","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-08 20:08:08 +0000 (Sun, 08 Oct 2023)</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'>Quick/Bulk Edit: Fix inability to quick edit draft post date.
Follow up to <a href="https://core.trac.wordpress.org/changeset/56022">[56022]</a> to fix inability to set a date/time in quick editing. Allow a user to set a quick/edit date while preventing accidental date assignments per the original intent.
Props tristanleboss, ivanzhuck, tibbsa, sabernhardt, sergeybiryukov, oandregal, khokansardar, joedolson, shailu25.
Fixes <a href="https://core.trac.wordpress.org/ticket/59125">#59125</a>. See <a href="https://core.trac.wordpress.org/ticket/19907">#19907</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmininlineeditpostjs">trunk/src/js/_enqueues/admin/inline-edit-post.js</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsajaxwpAjaxInlineSavephp">trunk/tests/phpunit/tests/ajax/wpAjaxInlineSave.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadmininlineeditpostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/inline-edit-post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/inline-edit-post.js 2023-10-08 18:19:53 UTC (rev 56801)
+++ trunk/src/js/_enqueues/admin/inline-edit-post.js 2023-10-08 20:08:08 UTC (rev 56802)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,13 +491,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"> fields = $('#edit-'+id).find(':input').serialize();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- var status = $(':input[name="_status"]').val();
-
- if ( [ 'draft', 'pending', 'auto-draft' ].includes( status ) ) {
- params.edit_date = 'false';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> params = fields + '&' + $.param(params);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make Ajax request.
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2023-10-08 18:19:53 UTC (rev 56801)
+++ trunk/src/wp-admin/includes/post.php 2023-10-08 20:08:08 UTC (rev 56802)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,10 +171,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">- if ( isset( $post_data['edit_date'] ) && 'false' === $post_data['edit_date'] ) {
- $post_data['edit_date'] = false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_data['edit_date'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $aa = $post_data['aa'];
</span><span class="cx" style="display: block; padding: 0 10px"> $mm = $post_data['mm'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +193,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_date', __( 'Invalid date.' ) );
</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">- $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">+ /*
+ * Only assign a post date if the user has explicitly set a new value.
+ * See #59125 and #19907.
+ */
+ $previous_date = $post_id ? get_post_field( 'post_date', $post_id ) : false;
+ if ( $previous_date && $previous_date !== $post_data['post_date'] ) {
+ $post_data['edit_date'] = true;
+ $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
+ } else {
+ $post_data['edit_date'] = false;
+ unset( $post_data['post_date'] );
+ unset( $post_data['post_date_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['post_category'] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxwpAjaxInlineSavephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/ajax/wpAjaxInlineSave.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/wpAjaxInlineSave.php 2023-10-08 18:19:53 UTC (rev 56801)
+++ trunk/tests/phpunit/tests/ajax/wpAjaxInlineSave.php 2023-10-08 20:08:08 UTC (rev 56802)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</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">- * When updating a draft in quick edit mode, it should not set the publish date of the post when this one will be published.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When updating a draft in quick edit mode, it should not set the publish date of the post if the date passed is unchanged.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 19907
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,6 +124,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['screen'] = 'edit-post';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['post_view'] = 'list';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['edit_date'] = 'false';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST['mm'] = get_the_date( 'm', $post );
+ $_POST['jj'] = get_the_date( 'd', $post );
+ $_POST['aa'] = get_the_date( 'Y', $post );
+ $_POST['hh'] = get_the_date( 'H', $post );
+ $_POST['mn'] = get_the_date( 'i', $post );
+ $_POST['ss'] = get_the_date( 's', $post );
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'inline-save' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ $post = get_post( $post->ID );
+
+ $post_date = sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $_POST['aa'], $_POST['mm'], $_POST['jj'], $_POST['hh'], $_POST['mn'], $_POST['ss'] );
+
+ $this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
+ }
+
+ /**
+ * When updating a draft in quick edit mode, it should set the publish date of the post if there is a new date set.
+ *
+ * @ticket 59125
+ *
+ * @covers ::edit_post
+ */
+ public function test_quick_edit_draft_should_set_publish_date() {
+ // Become an administrator.
+ $this->_setRole( 'administrator' );
+
+ $user = get_current_user_id();
+
+ $post = self::factory()->post->create_and_get(
+ array(
+ 'post_status' => 'draft',
+ 'post_author' => $user,
+ )
+ );
+
+ $this->assertSame( 'draft', $post->post_status );
+
+ $this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
+
+ // Set up a request.
+ $_POST['_inline_edit'] = wp_create_nonce( 'inlineeditnonce' );
+ $_POST['post_ID'] = $post->ID;
+ $_POST['post_type'] = 'post';
+ $_POST['content'] = 'content test';
+ $_POST['excerpt'] = 'excerpt test';
+ $_POST['_status'] = $post->post_status;
+ $_POST['post_status'] = $post->post_status;
+ $_POST['post_author'] = $user;
+ $_POST['screen'] = 'edit-post';
+ $_POST['post_view'] = 'list';
+ $_POST['edit_date'] = 'true';
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['mm'] = '09';
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['jj'] = 11;
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['aa'] = 2020;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,6 +197,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '2020-09-11 19:20:11', $post->post_date_gmt );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>