<!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>[BuddyPress][7700] trunk/bp-core/bp-core-classes.php: Remove unnecessary DISTINCT usages from `bp-core-classes.php`.</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7700">7700</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-12-18 00:01:01 +0000 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary DISTINCT usages from `bp-core-classes.php`. See <a href="http://buddypress.trac.wordpress.org/ticket/5303">#5303</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (7699 => 7700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2013-12-17 23:35:50 UTC (rev 7699)
+++ trunk/bp-core/bp-core-classes.php 2013-12-18 00:01:01 UTC (rev 7700)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> // number of minutes used as an interval
</span><span class="cx"> case 'online' :
</span><span class="cx"> $this->uid_name = 'user_id';
</span><del>- $sql['select'] = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
</del><ins>+ $sql['select'] = "SELECT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
</ins><span class="cx"> $sql['where'][] = $wpdb->prepare( "u.meta_key = %s", bp_get_user_meta_key( 'last_activity' ) );
</span><span class="cx"> $sql['where'][] = $wpdb->prepare( "u.meta_value >= DATE_SUB( UTC_TIMESTAMP(), INTERVAL %d MINUTE )", apply_filters( 'bp_user_query_online_interval', 15 ) );
</span><span class="cx"> $sql['orderby'] = "ORDER BY u.meta_value";
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> case 'newest' :
</span><span class="cx"> case 'random' :
</span><span class="cx"> $this->uid_name = 'user_id';
</span><del>- $sql['select'] = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
</del><ins>+ $sql['select'] = "SELECT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
</ins><span class="cx"> $sql['where'][] = $wpdb->prepare( "u.meta_key = %s", bp_get_user_meta_key( 'last_activity' ) );
</span><span class="cx">
</span><span class="cx"> if ( 'newest' == $type ) {
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> // 'popular' sorts by the 'total_friend_count' usermeta
</span><span class="cx"> case 'popular' :
</span><span class="cx"> $this->uid_name = 'user_id';
</span><del>- $sql['select'] = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
</del><ins>+ $sql['select'] = "SELECT u.{$this->uid_name} as id FROM {$wpdb->usermeta} u";
</ins><span class="cx"> $sql['where'][] = $wpdb->prepare( "u.meta_key = %s", bp_get_user_meta_key( 'total_friend_count' ) );
</span><span class="cx"> $sql['orderby'] = "ORDER BY CONVERT(u.meta_value, SIGNED)";
</span><span class="cx"> $sql['order'] = "DESC";
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> // @todo remove need for bp_is_active() check
</span><span class="cx"> if ( ! bp_disable_profile_sync() || ! bp_is_active( 'xprofile' ) ) {
</span><span class="cx"> $this->uid_name = 'ID';
</span><del>- $sql['select'] = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->users} u";
</del><ins>+ $sql['select'] = "SELECT u.{$this->uid_name} as id FROM {$wpdb->users} u";
</ins><span class="cx"> $sql['orderby'] = "ORDER BY u.display_name";
</span><span class="cx"> $sql['order'] = "ASC";
</span><span class="cx">
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> $fullname_field_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s", bp_xprofile_fullname_field_name() ) );
</span><span class="cx">
</span><span class="cx"> $this->uid_name = 'user_id';
</span><del>- $sql['select'] = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$bp->profile->table_name_data} u";
</del><ins>+ $sql['select'] = "SELECT u.{$this->uid_name} as id FROM {$bp->profile->table_name_data} u";
</ins><span class="cx"> $sql['where'][] = "u.field_id = {$fullname_field_id}";
</span><span class="cx"> $sql['orderby'] = "ORDER BY u.value";
</span><span class="cx"> $sql['order'] = "ASC";
</span><span class="lines">@@ -313,14 +313,14 @@
</span><span class="cx"> // Alphabetical queries ignore last_activity, while BP uses last_activity
</span><span class="cx"> // to infer spam/deleted/non-activated users. To ensure that these users
</span><span class="cx"> // are filtered out, we add an appropriate sub-query.
</span><del>- $sql['where'][] = "u.{$this->uid_name} IN ( SELECT ID FROM {$wpdb->users} WHERE " . bp_core_get_status_sql( '' ) . " )";
</del><ins>+ $sql['where'][] = "u.{$this->uid_name} IN ( SELECT id FROM {$wpdb->users} WHERE " . bp_core_get_status_sql( '' ) . " )";
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // Any other 'type' falls through
</span><span class="cx"> default :
</span><span class="cx"> $this->uid_name = 'ID';
</span><del>- $sql['select'] = "SELECT DISTINCT u.{$this->uid_name} as id FROM {$wpdb->users} u";
</del><ins>+ $sql['select'] = "SELECT u.{$this->uid_name} as id FROM {$wpdb->users} u";
</ins><span class="cx">
</span><span class="cx"> // In this case, we assume that a plugin is
</span><span class="cx"> // handling order, so we leave those clauses
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> if ( 'sql_calc_found_rows' == $this->query_vars['count_total'] ) {
</span><span class="cx"> $this->total_users = $wpdb->get_var( apply_filters( 'bp_found_user_query', "SELECT FOUND_ROWS()", $this ) );
</span><span class="cx"> } elseif ( 'count_query' == $this->query_vars['count_total'] ) {
</span><del>- $count_select = preg_replace( '/^SELECT.*?FROM (\S+) u/', "SELECT COUNT(DISTINCT u.{$this->uid_name}) FROM $1 u", $this->uid_clauses['select'] );
</del><ins>+ $count_select = preg_replace( '/^SELECT.*?FROM (\S+) u/', "SELECT COUNT(u.{$this->uid_name}) FROM $1 u", $this->uid_clauses['select'] );
</ins><span class="cx"> $this->total_users = $wpdb->get_var( apply_filters( 'bp_found_user_query', "{$count_select} {$this->uid_clauses['where']}", $this ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -871,7 +871,7 @@
</span><span class="cx">
</span><span class="cx"> $sql = array();
</span><span class="cx">
</span><del>- $sql['select_main'] = "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
</del><ins>+ $sql['select_main'] = "SELECT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
</ins><span class="cx">
</span><span class="cx"> if ( 'active' == $type || 'online' == $type || 'newest' == $type ) {
</span><span class="cx"> $sql['select_active'] = ", um.meta_value as last_activity";
</span><span class="lines">@@ -1013,7 +1013,7 @@
</span><span class="cx"> unset( $sql['pagination'] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- array_unshift( $sql, "SELECT COUNT(DISTINCT u.ID)" );
</del><ins>+ array_unshift( $sql, "SELECT COUNT(u.ID)" );
</ins><span class="cx">
</span><span class="cx"> // Get total user results
</span><span class="cx"> $total_users_sql = apply_filters( 'bp_core_get_total_users_sql', join( ' ', (array) $sql ), $sql );
</span><span class="lines">@@ -1131,8 +1131,8 @@
</span><span class="cx"> $user_ids = implode( ',', wp_parse_id_list( $user_ids ) );
</span><span class="cx"> $status_sql = bp_core_get_status_sql();
</span><span class="cx">
</span><del>- $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT COUNT(DISTINCT ID) FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids})" );
- $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids}) {$pag_sql}" );
</del><ins>+ $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT COUNT(ID) FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids})" );
+ $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', "SELECT ID as id, user_registered, user_nicename, user_login, user_email FROM {$wpdb->users} WHERE {$status_sql} AND ID IN ({$user_ids}) {$pag_sql}" );
</ins><span class="cx">
</span><span class="cx"> $total_users = $wpdb->get_var( $total_users_sql );
</span><span class="cx"> $paged_users = $wpdb->get_results( $paged_users_sql );
</span></span></pre>
</div>
</div>
</body>
</html>