<!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>[56123] trunk: Quick/Bulk Edit: Ensure scheduled posts are published when using Bulk Edit.</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/56123">56123</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/56123","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-07-02 08:02:45 +0000 (Sun, 02 Jul 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: Ensure scheduled posts are published when using Bulk Edit.

This changeset ensures scheduled posts are actually published when changing their status to "Published" using bulk edit. Also adds related unit tests.

Props siobhan, Clorith, webcommsat, cadic, oglekler, audrasjb, pavanpatil1.
Fixes <a href="https://core.trac.wordpress.org/ticket/31635">#31635</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<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-07-01 23:08:43 UTC (rev 56122)
+++ trunk/src/wp-admin/includes/post.php        2023-07-02 08:02:45 UTC (rev 56123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,6 +668,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                // Prevent wp_insert_post() from overwriting post format with the old data.
</span><span class="cx" style="display: block; padding: 0 10px">                unset( $post_data['tax_input']['post_format'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Reset post date of scheduled post to be published.
+               if (
+                       in_array( $post->post_status, array( 'future', 'draft' ), true ) &&
+                       'publish' === $post_data['post_status']
+               ) {
+                       $post_data['post_date']     = current_time( 'mysql' );
+                       $post_data['post_date_gmt'] = '';
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_id = wp_update_post( $post_data );
</span><span class="cx" style="display: block; padding: 0 10px">                update_post_meta( $post_id, '_edit_last', get_current_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px">                $updated[] = $post_id;
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></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/admin/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php  2023-07-01 23:08:43 UTC (rev 56122)
+++ trunk/tests/phpunit/tests/admin/includesPost.php    2023-07-02 08:02:45 UTC (rev 56123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,6 +294,72 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @ticket 31635
+        */
+       public function test_bulk_edit_posts_should_publish_scheduled_post() {
+               wp_set_current_user( self::$admin_id );
+
+               $post = self::factory()->post->create(
+                       array(
+                               'post_author'    => self::$author_ids[0],
+                               'comment_status' => 'closed',
+                               'ping_status'    => 'closed',
+                               'post_status'    => 'future',
+                               'post_date'      => gmdate( 'Y-m-d H:i:s', strtotime( '+1 month' ) ),
+                       )
+               );
+
+               $request = array(
+                       'post_type'      => 'post',
+                       'post_author'    => -1,
+                       'ping_status'    => -1,
+                       'comment_status' => -1,
+                       '_status'        => 'publish',
+                       'post'           => array( $post ),
+               );
+
+               bulk_edit_posts( $request );
+
+               $this->assertSame( 'publish', get_post_status( $post ) );
+               $this->assertLessThanOrEqual( gmdate( 'Y-m-d H:i:s' ), get_post_time( 'Y-m-d H:i:s', false, $post ) );
+       }
+       /**
+        * @ticket 31635
+        */
+       public function test_bulk_edit_posts_should_publish_draft_immediately() {
+               wp_set_current_user( self::$admin_id );
+
+               // Create draft last edited a month ago
+               $post = self::factory()->post->create(
+                       array(
+                               'post_author'    => self::$author_ids[0],
+                               'comment_status' => 'closed',
+                               'ping_status'    => 'closed',
+                               'post_status'    => 'draft',
+                               'post_date'      => gmdate( 'Y-m-d H:i:s', strtotime( '-1 month' ) ),
+                       )
+               );
+
+               $request = array(
+                       'post_type'      => 'post',
+                       'post_author'    => -1,
+                       'ping_status'    => -1,
+                       'comment_status' => -1,
+                       '_status'        => 'publish',
+                       'post'           => array( $post ),
+               );
+
+               bulk_edit_posts( $request );
+
+               $this->assertSame( 'publish', get_post_status( $post ) );
+
+               // Expect to be published within the last minute (to consider slow testing environment).
+               $minute_before = gmdate( 'Y-m-d H:i:s', strtotime( '-1 minute' ) );
+               $this->assertGreaterThanOrEqual( $minute_before, get_post_time( 'Y-m-d H:i:s', false, $post ) );
+               $this->assertLessThanOrEqual( gmdate( 'Y-m-d H:i:s' ), get_post_time( 'Y-m-d H:i:s', false, $post ) );
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * @ticket 41396
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function test_bulk_edit_posts_should_set_post_format_before_wp_update_post_runs() {
</span></span></pre>
</div>
</div>

</body>
</html>