<!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>[5286] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc: Support Forums: Update to query against the new Plugin Directory WP tables.</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/5286">5286</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/5286","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-07 21:16:09 +0000 (Fri, 07 Apr 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'>Support Forums: Update to query against the new Plugin Directory WP tables.
Updates `get_object_by_slug_and_type()`, `get_authors()`, `get_contributors()`, `get_plugin_slugs_by_committer()`, `get_plugin_slugs_by_contributor()`.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2701">#2701</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasssupportcompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp"></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/support-forums/inc/class-directory-compat.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/support-forums/inc/class-directory-compat.php 2017-04-07 18:51:44 UTC (rev 5285)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2017-04-07 21:16:09 UTC (rev 5286)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,19 +815,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $type == 'theme' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $compat_object = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->base_prefix}%d_posts WHERE post_name = %s AND post_type = 'repopackage' LIMIT 1", WPORG_THEME_DIRECTORY_BLOGID, $slug ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $type == 'plugin' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // @todo Update this when the Plugin Directory switches over to WordPress.
- $_compat_topic = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . PLUGINS_TABLE_PREFIX . "topics WHERE topic_slug = %s", $slug ) );
- if ( $_compat_topic ) {
- $_compat_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . PLUGINS_TABLE_PREFIX . "posts WHERE topic_id = %d AND post_position = 1 LIMIT 1", $_compat_topic->topic_id ) );
- }
- if ( $_compat_topic && $_compat_post ) {
- $compat_object = (object) array(
- 'post_title' => $_compat_topic->topic_title,
- 'post_name' => $slug,
- 'post_author' => $_compat_topic->topic_poster,
- 'post_content' => $_compat_post->post_text,
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compat_object = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->base_prefix}%d_posts WHERE post_name = %s AND post_type = 'plugin' LIMIT 1", WPORG_PLUGIN_DIRECTORY_BLOGID, $slug ) );
</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"> wp_cache_set( $cache_key, $compat_object, $cache_group, DAY_IN_SECONDS );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -853,7 +841,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author = get_user_by( 'id', $this->theme->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> $authors = array( $author->user_login );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $authors = $wpdb->get_col( $wpdb->prepare( " SELECT user FROM " . PLUGINS_TABLE_PREFIX . "svn_access WHERE `path` = %s", '/' . $slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
+ // Note: Intentionally not considering posts of 'plugin' post_type with
+ // 'post_author' matching this author because the field only relates to
+ // the user who submitted the plugin. It does not confer special access,
+ // rights, or ownership.
+ $authors = $wpdb->get_col( $wpdb->prepare(
+ "SELECT slug
+ FROM {$prefix}terms AS t
+ LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
+ LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
+ WHERE tt.taxonomy = 'plugin_committers' AND tr.object_id = %d",
+ $this->plugin->ID
+ ) );
</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"> wp_cache_set( $cache_key, $authors, $cache_group, HOUR_IN_SECONDS );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,13 +879,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_group = $this->compat() . '-contributors';
</span><span class="cx" style="display: block; padding: 0 10px"> $contributors = wp_cache_get( $cache_key, $cache_group );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $contributors ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // @todo Update this when the Plugin Directory switches over to WordPress.
- $contributors = $wpdb->get_var( $wpdb->prepare(
- "SELECT meta_value FROM " . PLUGINS_TABLE_PREFIX . "meta m LEFT JOIN " . PLUGINS_TABLE_PREFIX . "topics t ON m.object_id = t.topic_id WHERE t.topic_slug = %s AND m.object_type = %s AND m.meta_key = %s",
- $slug, 'bb_topic', 'contributors' ) );
- if ( $contributors ) {
- $contributors = unserialize( $contributors );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
+ $contributors = $wpdb->get_col( $wpdb->prepare(
+ "SELECT slug
+ FROM {$prefix}terms AS t
+ LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
+ LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
+ WHERE tt.taxonomy = 'plugin_contributors' AND tr.object_id = %d",
+ $this->plugin->ID
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $cache_key, $contributors, $cache_group, HOUR_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasssupportcompatphp"></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/support-forums/inc/class-support-compat.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/support-forums/inc/class-support-compat.php 2017-04-07 18:51:44 UTC (rev 5285)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php 2017-04-07 21:16:09 UTC (rev 5286)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_query' => array( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'topic-plugin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'slug',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'terms' => self::get_plugin_slugs_by_committer( $this->user->user_login ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'terms' => self::get_plugin_slugs_by_committer( $this->user->user_nicename ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_stickies' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_query' => array( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'topic-plugin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'slug',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'terms' => $this->get_plugin_slugs_by_contributor( $this->user ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'terms' => $this->get_plugin_slugs_by_contributor( $this->user->user_nicename ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_stickies' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $view == 'plugin-committer' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = self::get_plugin_slugs_by_committer( $this->user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slugs = self::get_plugin_slugs_by_committer( $this->user->user_nicename );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add plugin-committer view.
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_register_view(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $view == 'plugin-contributor' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = self::get_plugin_slugs_by_contributor( $this->user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slugs = self::get_plugin_slugs_by_contributor( $this->user->user_nicename );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add plugin-contributor view.
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_register_view(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,21 +452,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return in_array( $post_id, self::get_compat_forums() );
</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">- public static function get_plugin_slugs_by_committer( $user_login ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_plugin_slugs_by_committer( $user_nicename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = (array) $wpdb->get_col( $wpdb->prepare( "SELECT `path` FROM `" . PLUGINS_TABLE_PREFIX . "svn_access` WHERE `user` = %s AND `access` = 'rw'", $user_login ) );
- return self::clean_slugs( $slugs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
+ $slugs = $wpdb->get_col( $wpdb->prepare(
+ "SELECT post_name
+ FROM {$prefix}posts AS p
+ LEFT JOIN {$prefix}term_relationships AS tr ON p.ID = tr.object_id
+ LEFT JOIN {$prefix}term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id
+ LEFT JOIN {$prefix}terms AS t ON tt.term_id = t.term_id
+ WHERE tt.taxonomy = 'plugin_committers' AND p.post_status = 'publish' AND p.post_type = 'plugin' AND t.slug = %s
+ ORDER BY p.post_title ASC",
+ $user_nicename
+ ) );
+
+ return $slugs;
</ins><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">- public static function get_plugin_slugs_by_contributor( $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_plugin_slugs_by_contributor( $user_nicename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = (array) $wpdb->get_col( $wpdb->prepare( "SELECT `topic_slug` FROM `" . PLUGINS_TABLE_PREFIX . "topics` WHERE `topic_poster` = %d AND topic_open = 1 AND topic_status = 0", $user->ID ) );
- $slugs = self::clean_slugs( $slugs );
- if ( $contributor = $wpdb->get_col( $wpdb->prepare( "SELECT `object_id` FROM `" . PLUGINS_TABLE_PREFIX . "meta` WHERE `object_type` = 'bb_topic' AND `meta_key` = 'contributors' AND `meta_value` LIKE %s", '%"' . str_replace( array( '%', '_' ), array( '\\%', '\\_' ), $user->user_login ) . '"%' ) ) ) {
- if ( $contributor_slugs = $wpdb->get_col( "SELECT `topic_slug` FROM `" . PLUGINS_TABLE_PREFIX . "topics` WHERE `topic_id` IN (" . join( ',', $contributor ) . ") AND topic_open = 1 AND topic_status = 0" ) ) {
- $slugs = array_unique( array_merge( $slugs, $contributor_slugs ) );
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
+ $slugs = $wpdb->get_col( $wpdb->prepare(
+ "SELECT post_name
+ FROM {$prefix}posts AS p
+ LEFT JOIN {$prefix}term_relationships AS tr ON p.ID = tr.object_id
+ LEFT JOIN {$prefix}term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id
+ LEFT JOIN {$prefix}terms AS t ON tt.term_id = t.term_id
+ WHERE tt.taxonomy = 'plugin_contributors' AND p.post_status = 'publish' AND p.post_type = 'plugin' AND t.slug = %s
+ ORDER BY p.post_title ASC",
+ $user_nicename
+ ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $slugs;
</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>