<!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>[13308] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Upload: Don't overwrite the `post_date` field when uploading a new version of the plugin.</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="http://meta.trac.wordpress.org/changeset/13308">13308</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13308","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-03-12 02:27:28 +0000 (Tue, 12 Mar 2024)</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'>Plugin Directory: Upload: Don't overwrite the `post_date` field when uploading a new version of the plugin.
This will allow for more performant queries for pending plugins.
See <a href="http://meta.trac.wordpress.org/ticket/7384">#7384</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2024-03-12 01:41:59 UTC (rev 13307)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2024-03-12 02:27:28 UTC (rev 13308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1833,6 +1833,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $args['post_title'] ?: $args['post_name'];
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = $args['post_name'] ?: sanitize_title( $title );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove null items (date-related fields) to fallback to the defaults below.
+ $args = array_filter(
+ $args,
+ function( $item ) {
+ return ! is_null( $item );
+ }
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_date = current_time( 'mysql' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = current_time( 'mysql', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1846,21 +1854,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_modified_gmt' => $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">- $update = ! empty( $args['ID'] );
</del><span class="cx" style="display: block; padding: 0 10px"> $result = wp_insert_post( $args, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $result, $slug, 'plugin-slugs' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = get_post( $result );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( ! $update ) {
- $owner = get_userdata( $result->post_author );
- Tools::audit_log( sprintf(
- 'Submitted by <a href="%s">%s</a>.',
- esc_url( 'https://profiles.wordpress.org/' . $owner->user_nicename . '/' ),
- $owner->user_login
- ), $result->ID );
- }
</del><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"> return $result;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2024-03-12 01:41:59 UTC (rev 13307)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2024-03-12 02:27:28 UTC (rev 13308)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\CLI\Import;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Readme\Parser;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Plugin_Directory;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Tools;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Admin\Tools\Upload_Token;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Clients\HelpScout;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,12 +422,14 @@
</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"> $post_args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => $plugin_post->ID ?? 0,
- 'post_title' => $this->plugin['Name'],
- 'post_name' => $this->plugin_slug,
- 'post_status' => $plugin_post->post_status ?? 'new',
- 'post_content' => $content,
- 'post_excerpt' => $this->plugin['Description'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => $plugin_post->ID ?? 0,
+ 'post_title' => $this->plugin['Name'],
+ 'post_name' => $this->plugin_slug,
+ 'post_status' => $plugin_post->post_status ?? 'new',
+ 'post_content' => $content,
+ 'post_excerpt' => $this->plugin['Description'],
+ 'post_date' => $plugin_post->post_date ?? null,
+ 'post_date_gmt' => $plugin_post->post_date_gmt ?? null,
</ins><span class="cx" style="display: block; padding: 0 10px"> // 'tax_input' => wp_unslash( $_POST['tax_input'] ), // for category selection
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tested' => $readme->tested,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +468,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"> // First time submission, track some additional metadata.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $plugin_post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $updating_existing ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_args['meta_input']['_author_ip'] = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_args['meta_input']['_submitted_date'] = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_args['meta_input']['_used_upload_token'] = $has_upload_token;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,6 +481,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $plugin_post;
</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">+ // Record the submitter.
+ if ( ! $updating_existing ) {
+ Tools::audit_log(
+ sprintf(
+ 'Submitted by <a href="%s">%s</a>.',
+ esc_url( 'https://profiles.wordpress.org/' . wp_get_current_user()->user_nicename . '/' ),
+ wp_get_current_user()->user_login
+ ),
+ $plugin_post->ID
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachment = $this->save_zip_file( $plugin_post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $attachment ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $attachment;
</span></span></pre>
</div>
</div>
</body>
</html>