<!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>[4214] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Add a `plugin_committer` taxonomy and sync it with the svn_access table.</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/4214">4214</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/4214","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>2016-10-11 08:27:15 +0000 (Tue, 11 Oct 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: Add a `plugin_committer` taxonomy and sync it with the svn_access table.
The taxonomy is only used to ease querying, and allows for `/author/$self` to display both plugins you're listed as a contributor for and those you have commit access for.

See <a href="http://meta.trac.wordpress.org/ticket/2111">#2111</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_htmlwpcontentpluginsplugindirectoryclasstoolsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php</a></li>
<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_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-10-11 06:42:46 UTC (rev 4213)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php        2016-10-11 08:27:15 UTC (rev 4214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,9 +39,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'init', array( $this, 'init' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'init', array( $this, 'register_shortcodes' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'widgets_init', array( $this, 'register_widgets' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'post_type_link', array( $this, 'package_link' ), 10, 2 );
-               add_filter( 'term_link', array( $this, 'term_link' ), 10, 2 );
-               add_action( 'pre_get_posts', array( $this, 'use_plugins_in_query' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'post_type_link', array( $this, 'filter_post_type_link' ), 10, 2 );
+               add_filter( 'term_link', array( $this, 'filter_term_link' ), 10, 2 );
+               add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'rest_api_allowed_post_types', array( $this, 'filter_allowed_post_types' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'pre_update_option_jetpack_options', array( $this, 'filter_jetpack_options' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'template_redirect', array( $this, 'prevent_canonical_for_plugins' ), 9 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,6 +208,22 @@
</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">+                register_taxonomy( 'plugin_committers', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
+                       'hierarchical'      => false,
+                       'query_var'         => 'plugin_committer',
+                       'rewrite'           => false,
+                       'labels'            => array(
+                               'name' => __( 'Committers', 'wporg-plugins' ),
+                               'singular_name' => __( 'Committer', 'wporg-plugins' ),
+                       ),
+                       'public'            => true,
+                       'show_ui'           => true,
+                       'show_admin_column' => false,
+                       'capabilities'      => array(
+                               'assign_terms' => 'do_not_allow',
+                       ),
+               ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 register_taxonomy( 'plugin_tags', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'hierarchical'      => false,
</span><span class="cx" style="display: block; padding: 0 10px">                        'query_var'         => 'plugin_tags',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param \WP_Post $post The Plugin post object.
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function package_link( $link, $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_post_type_link( $link, $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'plugin' !== $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return $link;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param \WP_Term $term      The term the link is for.
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string|false
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function term_link( $term_link, $term ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_term_link( $term_link, $term ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'plugin_business_model' == $term->taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return false;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,20 +475,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @param \WP_Query $wp_query The WordPress Query object.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function use_plugins_in_query( $wp_query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function pre_get_posts( $wp_query ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( is_admin() ) {
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Unless otherwise specified, we start off by querying for publish'd plugins.
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $wp_query->query_vars['pagename'] ) && ( empty( $wp_query->query_vars['post_type'] ) || 'post' == $wp_query->query_vars['post_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_query->query_vars['post_type']   = array( 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_query->query_vars['post_status'] = array( 'publish' );
</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">+                // By default, if no query is made, we're querying /browse/featured/
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( empty( $wp_query->query ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_query->query_vars['browse'] = 'featured';
</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">+                // Set up custom queries for the /browse/ URLs
</ins><span class="cx" style="display: block; padding: 0 10px">                 switch ( $wp_query->get( 'browse' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'favorites':
</span><span class="cx" style="display: block; padding: 0 10px">                                $favorites_user = wp_get_current_user();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,6 +520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</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">+                // For /browse/ requests, we conditionally need to avoid querying the taxonomy for most views (as it's handled in code above)
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $wp_query->query['browse'] ) && 'beta' != $wp_query->query['browse'] && 'featured' != $wp_query->query['browse'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        unset( $wp_query->query_vars['browse'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,10 +536,37 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }, 10, 2 );
</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">+                // Holds a truthful value when viewing an author archive for the current user, or a plugin reviewer viewing an author archive
+               $viewing_own_author_archive = false;
+
+               // Author Archives need to be created
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $wp_query->query['author_name'] ) || isset( $wp_query->query['author'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $user = isset( $wp_query->query['author_name'] ) ? $wp_query->query['author_name'] : (get_user_by( 'id', $wp_query->query['author'])->user_nicename);
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $wp_query->query_vars['plugin_contributor'] = $user;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $viewing_own_author_archive = is_user_logged_in() && ( current_user_can( 'plugin_review' ) || 0 === strcasecmp( $user, wp_get_current_user()->user_nicename ) );
+
+                       // Author archives by default list plugins you're a contributor on.
+                       $wp_query->query_vars['tax_query'] = array(
+                               'relation' => 'OR',
+                               array(
+                                       'taxonomy' => 'plugin_contributors',
+                                       'field' => 'slug',
+                                       'terms' => $user
+                               )
+                       );
+
+                       // Author archives for self include plugins you're a committer on, not just publically a contributor
+                       // Plugin Reviewers also see plugins you're a committer on here.
+                       if ( $viewing_own_author_archive ) {
+                               $wp_query->query_vars['tax_query'][] = array(
+                                       'taxonomy' => 'plugin_committers',
+                                       'field' => 'slug',
+                                       'terms' => $user
+                               );
+                       }
+
+                       // TODO: Make plugins owned by `post_author = $current_user_id` show up here when they're not-publish?
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         $wp_query->query_vars['orderby'] = 'post_title';
</span><span class="cx" style="display: block; padding: 0 10px">                        $wp_query->query_vars['order'] = 'ASC';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,16 +578,8 @@
</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">                // For singular requests, or self-author profile requests allow restricted post_status items to show on the front-end.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( is_user_logged_in() && (
-                       !empty( $wp_query->query_vars['name'] ) ||
-                       (
-                               !empty( $wp_query->query_vars['plugin_contributor'] ) &&
-                               (
-                                       current_user_can( 'plugin_review' ) ||
-                                       0 === strcasecmp( $wp_query->query_vars['plugin_contributor'], wp_get_current_user()->user_nicename )
-                               )
-                       ) )
-               ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $viewing_own_author_archive || ( is_user_logged_in() && !empty( $wp_query->query_vars['name'] ) ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         $wp_query->query_vars['post_status'] = array( 'pending', 'approved', 'publish', 'closed', 'disabled' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        add_filter( 'posts_results', function( $posts, $this_wp_query ) use( $wp_query ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,6 +794,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                switch ( $term->taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'plugin_contributors':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        case 'plugin_committers':
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $user = get_user_by( 'slug', $term->slug );
</span><span class="cx" style="display: block; padding: 0 10px">                                $name = $user->display_name;
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstoolsphp"></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-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/class-tools.php 2016-10-11 06:42:46 UTC (rev 4213)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php   2016-10-11 08:27:15 UTC (rev 4214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,6 +121,29 @@
</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">+         * Syncs the list of committers from the svn_access table to a taxonomy.
+        *
+        * @static
+        * @param string $plugin_slug The Plugin Slug to sync.
+        */
+       public static function sync_plugin_committers_with_taxonomy( $plugin_slug ) {
+               $post = Plugin_Directory::get_plugin_post( $plugin_slug );
+               if ( ! $post ) {
+                       return false;
+               }
+
+               $committer_slugs = array();
+               foreach ( Tools::get_plugin_committers( $plugin_slug ) as $committer ) {
+                       $user = get_user_by( 'login', $committer );
+                       if ( $user ) {
+                               $committer_slugs[] = $user->user_nicename;
+                       }
+               }
+
+               wp_set_post_terms( $post->ID, $committer_slugs, 'plugin_committers' );
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Grant a user RW access to a plugin.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @static
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,14 +171,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return true;
</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">-                wp_cache_delete( "{$plugin_slug}_committer", 'wporg-plugins' );
-               wp_cache_delete( "{$user->user_login}_committer", 'wporg-plugins' );
-
-               return (bool) $wpdb->insert( PLUGINS_TABLE_PREFIX . 'svn_access', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $result = (bool) $wpdb->insert( PLUGINS_TABLE_PREFIX . 'svn_access', array(
</ins><span class="cx" style="display: block; padding: 0 10px">                         'path'   => "/{$plugin_slug}",
</span><span class="cx" style="display: block; padding: 0 10px">                        'user'   => $user->user_login,
</span><span class="cx" style="display: block; padding: 0 10px">                        'access' => 'rw',
</span><span class="cx" style="display: block; padding: 0 10px">                ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               wp_cache_delete( "{$plugin_slug}_committer", 'wporg-plugins' );
+               wp_cache_delete( "{$user->user_login}_committer", 'wporg-plugins' );
+               Tools::sync_plugin_committers_with_taxonomy( $plugin_slug );
+
+               return $result;
</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">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,13 +205,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return false;
</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">+                $result = (bool) $wpdb->delete( PLUGINS_TABLE_PREFIX . 'svn_access', array(
+                       'path' => "/{$plugin_slug}",
+                       'user' => $user->user_login,
+               ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_cache_delete( "{$plugin_slug}_committer", 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">                wp_cache_delete( "{$user->user_login}_committer", 'wporg-plugins' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                Tools::sync_plugin_committers_with_taxonomy( $plugin_slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $wpdb->delete( PLUGINS_TABLE_PREFIX . 'svn_access', array(
-                       'path' => "/{$plugin_slug}",
-                       'user' => $user->user_login,
-               ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $result;
</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">        /**
</span></span></pre></div>
<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    2016-10-11 06:42:46 UTC (rev 4213)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php      2016-10-11 08:27:15 UTC (rev 4214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,6 +149,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                // Update the contributors list
</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_post_terms( $plugin->ID, $readme->contributors, 'plugin_contributors' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Update the committers list
+               Tools::sync_plugin_committers_with_taxonomy( $plugin->post_name );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( in_array( 'adopt-me', $readme->tags ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        wp_set_post_terms( $plugin->ID, array( 74 /* Term ID for adopt-me */ ), 'plugin_section' );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre>
</div>
</div>

</body>
</html>