<!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>[3034] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Allow authors to update their plugin submissions.</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="http://meta.trac.wordpress.org/changeset/3034">3034</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/3034","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-28 17:40:32 +0000 (Thu, 28 Apr 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'>Plugin Directory: Allow authors to update their plugin submissions.
If the initial version of a plugin does not satisfy review requirements, plugin
authors need a way to update their plugin for further review.
This now adds subsequent zip files by the same author to existing tickets and
adjusts logic and UI in a few places to handle multiple zip files.
See <a href="http://meta.trac.wordpress.org/ticket/1570">#1570</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassreviewtoolsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php</a></li>
<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_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp"></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/admin/class-status-transitions.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/admin/class-status-transitions.php 2016-04-28 16:02:05 UTC (rev 3033)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php 2016-04-28 17:40:32 UTC (rev 3034)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $attachment = current( $attachments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = end( $attachments );
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_author = get_user_by( 'id', $post->post_author );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create SVN repo.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,8 +101,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'password' => AUTOMATTIC_SVN_TRACKER__SVN_PASSWORD,
</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">- // Delete zip.
- wp_delete_attachment( $attachment->ID, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Delete zips.
+ foreach ( $attachments as $attachment ) {
+ wp_delete_attachment( $attachment->ID, true );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Grant commit access.
</span><span class="cx" style="display: block; padding: 0 10px"> Tools::grant_plugin_committer( $post->post_name, $plugin_author );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassreviewtoolsphp"></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/admin/metabox/class-review-tools.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/admin/metabox/class-review-tools.php 2016-04-28 16:02:05 UTC (rev 3033)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php 2016-04-28 17:40:32 UTC (rev 3034)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,12 +8,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Review_Tools {
</span><span class="cx" style="display: block; padding: 0 10px"> static function display() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = get_post();
- $zip_files = get_attached_media( 'application/zip', $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $zip_files ) {
- $zip_file = current( $zip_files );
- $zip_url = wp_get_attachment_url( $zip_file->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( get_attached_media( 'application/zip', $post ) as $zip_file ) {
+ $zip_url = wp_get_attachment_url( $zip_file->ID );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( '<p>' . __( '<strong>Zip file:</strong> %s', 'wporg-plugins' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%s">%s</a>', esc_url( $zip_url ), esc_html( $zip_url ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<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 2016-04-28 16:02:05 UTC (rev 3033)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2016-04-28 17:40:32 UTC (rev 3034)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = get_posts( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'plugin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $plugin_slug,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_status' => array( 'publish', 'pending', 'disabled', 'closed' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_status' => array( 'publish', 'pending', 'disabled', 'closed', 'draft' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $posts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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 2016-04-28 16:02:05 UTC (rev 3033)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2016-04-28 17:40:32 UTC (rev 3034)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,8 +93,10 @@
</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">- // Is there already a plugin with the name name?
- if ( Plugin_Directory::get_plugin_post( $this->plugin_slug ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_post = Plugin_Directory::get_plugin_post( $this->plugin_slug );
+
+ // Is there already a plugin by a different author?
+ if ( $plugin_post instanceof \WP_Post && $plugin_post->post_author != get_current_user_id() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: plugin slug, 2: style.css */
</span><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'There is already a plugin called %1$s by a different author. Please change the name of your plugin and upload it again.', 'wporg-plugins' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $this->plugin_slug . '</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,46 +159,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Passed all tests!
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's save everything and get things wrapped up.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = '';
- foreach ( $readme->sections as $section => $section_content ) {
- $content .= "\n\n<!--section={$section}-->\n{$section_content}";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create a new post on first-time submissions.
+ if ( ! ( $plugin_post instanceof \WP_Post ) ) {
+ $content = '';
+ foreach ( $readme->sections as $section => $section_content ) {
+ $content .= "\n\n<!--section={$section}-->\n{$section_content}";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add a Plugin Directory entry for this plugin.
- $plugin_post = Plugin_Directory::create_plugin_post( array(
- 'title' => $this->plugin['Name'],
- 'slug' => $this->plugin_slug,
- 'status' => 'draft',
- 'author' => get_current_user_id(),
- 'content' => $content,
- 'description' => $this->plugin['Description'],
- 'tags' => $readme->tags,
- 'meta' => array(
- 'tested' => $readme->tested,
- 'requires' => $readme->requires,
- 'stable_tag' => $readme->stable_tag,
- 'upgrade_notice' => $readme->upgrade_notice,
- 'contributors' => $readme->contributors,
- 'screenshots' => $readme->screenshots,
- 'donate_link' => $readme->donate_link,
- 'sections' => array_keys( $readme->sections ),
- 'version' => $this->plugin['Version'],
- 'header_name' => $this->plugin['Name'],
- 'header_plugin_uri' => $this->plugin['PluginURI'],
- 'header_author' => $this->plugin['Author'],
- 'header_author_uri' => $this->plugin['AuthorURI'],
- 'header_textdomain' => $this->plugin['TextDomain'],
- 'header_description' => $this->plugin['Description'],
- 'assets_screenshots' => array(),
- 'assets_icons' => array(),
- 'assets_banners' => array(),
- 'assets_banners_color' => false,
- 'support_threads' => 0,
- 'support_threads_resolved' => 0,
- ),
- ) );
- if ( is_wp_error( $plugin_post ) ) {
- return $plugin_post->get_error_message();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add a Plugin Directory entry for this plugin.
+ $plugin_post = Plugin_Directory::create_plugin_post( array(
+ 'title' => $this->plugin['Name'],
+ 'slug' => $this->plugin_slug,
+ 'status' => 'draft',
+ 'author' => get_current_user_id(),
+ 'content' => $content,
+ 'description' => $this->plugin['Description'],
+ 'tags' => $readme->tags,
+ 'meta' => array(
+ 'tested' => $readme->tested,
+ 'requires' => $readme->requires,
+ 'stable_tag' => $readme->stable_tag,
+ 'upgrade_notice' => $readme->upgrade_notice,
+ 'contributors' => $readme->contributors,
+ 'screenshots' => $readme->screenshots,
+ 'donate_link' => $readme->donate_link,
+ 'sections' => array_keys( $readme->sections ),
+ 'version' => $this->plugin['Version'],
+ 'header_name' => $this->plugin['Name'],
+ 'header_plugin_uri' => $this->plugin['PluginURI'],
+ 'header_author' => $this->plugin['Author'],
+ 'header_author_uri' => $this->plugin['AuthorURI'],
+ 'header_textdomain' => $this->plugin['TextDomain'],
+ 'header_description' => $this->plugin['Description'],
+ 'assets_screenshots' => array(),
+ 'assets_icons' => array(),
+ 'assets_banners' => array(),
+ 'assets_banners_color' => false,
+ 'support_threads' => 0,
+ 'support_threads_resolved' => 0,
+ ),
+ ) );
+ if ( is_wp_error( $plugin_post ) ) {
+ return $plugin_post->get_error_message();
+ }
</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"> $attachment = $this->save_zip_file( $plugin_post->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +298,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|\WP_Error Attachment ID or upload error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function save_zip_file( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_FILES['zip_file']['name'] = wp_generate_password( 12, false ) . '-' . $_FILES['zip_file']['name'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_FILES['zip_file']['name'] = date( 'd_H-i-s' ) . '_' . $_FILES['zip_file']['name'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_site_option_upload_filetypes', array( $this, 'whitelist_zip_files' ) );
</span></span></pre>
</div>
</div>
</body>
</html>