<!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>[4197] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Switch Contributors from being stored as post meta to a taxonomy to allow for more efficient querying.</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/4197">4197</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/4197","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-07 04:44:39 +0000 (Fri, 07 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: Switch Contributors from being stored as post meta to a taxonomy to allow for more efficient querying.
`/author/$author/` / `author_name` queries are now based on this taxonomy rather than by the `post_author`.
See <a href="http://meta.trac.wordpress.org/ticket/1724">#1724</a>, <a href="http://meta.trac.wordpress.org/ticket/1840">#1840</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.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_htmlwpcontentpluginsplugindirectorycliclassimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorystandaloneclasspluginsinfoapirequestphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api-request.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginphp"></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/api/routes/class-plugin.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/api/routes/class-plugin.php 2016-10-07 04:35:28 UTC (rev 4196)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php 2016-10-07 04:44:39 UTC (rev 4197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result['author_profile'] = $this->get_user_profile_link( $post->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> $result['contributors'] = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributors = get_post_meta( $post_id, 'contributors', true ) ?: array( $post->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $contributors = get_the_terms( $post->ID, 'plugin_contributors' ) ) {
+ $contributors = wp_list_pluck( $contributors, 'slug' );
+ } else {
+ $contributors = array();
+ if ( $author = get_user_by( 'id', $post->post_author ) ) {
+ $contributors[] = $author->user_nicename;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $contributors as $contributor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'slug', $contributor );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user ) {
</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-10-07 04:35:28 UTC (rev 4196)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2016-10-07 04:44:39 UTC (rev 4197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,8 +195,24 @@
</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">- register_taxonomy( 'plugin_tags', 'plugin', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_taxonomy( 'plugin_contributors', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'query_var' => 'plugin_contributor',
+ 'rewrite' => false,
+ 'labels' => array(
+ 'name' => __( 'Plugin Contributors', 'wporg-plugins' ),
+ 'singular_name' => __( 'Plugin Contributor', 'wporg-plugins' ),
+ ),
+ 'public' => true,
+ 'show_ui' => true,
+ 'show_admin_column' => false,
+ 'capabilities' => array(
+ 'assign_terms' => 'do_not_allow',
+ ),
+ ) );
+
+ register_taxonomy( 'plugin_tags', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
+ 'hierarchical' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => 'plugin_tags',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +468,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|\WP_Error The term to add or update or WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function pre_insert_term_prevent( $term, $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'plugin_tags' != $taxonomy && ! is_super_admin() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_taxonomies = array( 'plugin_tags', 'plugin_contributors' );
+
+ if ( ! in_array( $taxonomy, $allowed_taxonomies ) && ! is_super_admin() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = new \WP_Error( 'not-allowed', __( 'You are not allowed to add terms.', 'wporg-plugins' ) );
</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">@@ -519,6 +537,17 @@
</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">+ if ( isset( $wp_query->query['author_name'] ) || isset( $wp_query->query['author'] ) ) {
+ $user = isset( $wp_query->query['author_name'] ) ? $wp_query->query['author_name'] : (get_user_by( 'id', $wp_query->query['author'])->user_nicename);
+
+ $wp_query->query_vars['plugin_contributor'] = $user;
+ $wp_query->query_vars['orderby'] = 'post_title';
+ $wp_query->query_vars['order'] = 'ASC';
+
+ unset( $wp_query->query_vars['author_name'], $wp_query->query_vars['author'] );
+
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_query->is_archive() && empty( $wp_query->query_vars['orderby'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query->query_vars['orderby'] = 'meta_value_num';
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query->query_vars['meta_key'] = '_active_installs';
</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-07 04:35:28 UTC (rev 4196)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2016-10-07 04:44:39 UTC (rev 4197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'license',
</span><span class="cx" style="display: block; padding: 0 10px"> 'license_uri',
</span><span class="cx" style="display: block; padding: 0 10px"> 'upgrade_notice',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'contributors',
</del><span class="cx" style="display: block; padding: 0 10px"> 'screenshots'
</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">@@ -147,6 +146,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set tags from the readme
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $plugin->ID, $readme->tags, 'plugin_tags' );
</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 contributors list
+ wp_set_post_terms( $plugin->ID, $readme->contributors, 'plugin_contributors' );
+
</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>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorystandaloneclasspluginsinfoapirequestphp"></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/standalone/class-plugins-info-api-request.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/standalone/class-plugins-info-api-request.php 2016-10-07 04:35:28 UTC (rev 4196)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api-request.php 2016-10-07 04:44:39 UTC (rev 4197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Tags
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->args->tag ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query['plugin_tag'] = is_array( $this->args->tag ) ? reset( $this->args->tag ) : $this->args->tag;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query['plugin_tags'] = $this->args->tag;
</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"> // Search
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Author
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->args->author ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query['author_name'] = $this->args->author;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //$query['contributor_search'] = $this->args->author; // TODO
</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"> }
</span></span></pre>
</div>
</div>
</body>
</html>