<!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>[5200] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php: Plugin Directory: Remove the import-from-bbPress code for statuses & plugin posts.</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/5200">5200</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/5200","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>2017-03-29 23:04:05 +0000 (Wed, 29 Mar 2017)</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: Remove the import-from-bbPress code for statuses & plugin posts.
This caused a plugin which had been marked as `closed` after the directory launch to have it's status set back to `publish`, this happened as it pulled the previous status from bbPress over.
The only status change which should happen post-commit is the approvad -> published change, which is now handled here.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2635">#2635</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp"></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/cli/class-import.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/cli/class-import.php 2017-03-29 22:19:49 UTC (rev 5199)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2017-03-29 23:04:05 UTC (rev 5200)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,53 +56,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin = Plugin_Directory::get_plugin_post( $plugin_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $plugin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// TODO throw new Exception( "Unknown Plugin" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new Exception( "Unknown Plugin" );
</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"> $data = $this->export_and_parse_plugin( $plugin_slug );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // TODO: During development while the bbPress variant is still running, we'll pull details from it and allow importing of any plugin.
- $topic = $wpdb->get_row( $wpdb->prepare( 'SELECT * FROM ' . PLUGINS_TABLE_PREFIX . 'topics WHERE topic_slug = %s', $plugin_slug ) );
-
- if ( ! $plugin && ! $topic ) {
- throw new Exception( "Unknown Plugin" );
- }
-
- // TODO: During development we're just going to import status from bbPress.
- $status = 'publish';
- if ( 2 == $topic->topic_open ) {
- $status = 'approved';
- } elseif ( 2 == $topic->forum_id ) {
- $status = 'pending';
- } elseif ( 4 == $topic->forum_id || 'rejected-' == substr( $topic->topic_slug, 0, 9 ) ) {
- $status = 'rejected';
- } elseif ( 1 == $topic->forum_id && 0 == $topic->topic_open ) {
- $status = 'closed';
- } elseif ( 3 == $topic->topic_open ) {
- $status = 'disabled';
- }
-
- $plugin_existed_already = (bool) $plugin;
- if ( ! $plugin ) {
- $author_ip = $wpdb->get_var( $wpdb->prepare( 'SELECT poster_ip FROM ' . PLUGINS_TABLE_PREFIX . 'posts WHERE topic_id = %s', $topic->topic_id ) );
-
- add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
- $plugin = Plugin_Directory::create_plugin_post( array(
- 'post_name' => $plugin_slug,
- 'post_status' => $status,
- 'post_author' => $topic->topic_poster,
- 'post_date_gmt' => $topic->topic_start_time,
- 'post_date' => $topic->topic_start_time,
- 'post_modified' => $topic->topic_time,
- 'post_modified_gmt' => $topic->topic_time,
- 'meta_input' => array(
- '_author_ip' => $author_ip,
- ),
- ) );
- remove_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ) );
- }
- $plugin->post_status = $status;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $readme = $data['readme'];
</span><span class="cx" style="display: block; padding: 0 10px"> $assets = $data['assets'];
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = $data['plugin_headers'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,6 +88,13 @@
</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">+ // Plugins should move from 'approved' to 'publish' on first parse
+ // `export_and_parse_plugin()` will throw an exception in the case where plugin files cannot be found,
+ // so by this time the plugin should be live.
+ if ( 'approved' === $plugin->post_status ) {
+ $plugin->post_status = 'publish';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( $plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ) );
</span></span></pre>
</div>
</div>
</body>
</html>