<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2549] trunk/bp-groups:
Fixing group member listing loop queries.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2549</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-02 22:19:14 +0000 (Tue, 02 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing group member listing loop queries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (2548 => 2549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2010-02-02 22:09:12 UTC (rev 2548)
+++ trunk/bp-groups/bp-groups-classes.php 2010-02-02 22:19:14 UTC (rev 2549)
</span><span class="lines">@@ -967,7 +967,10 @@
</span><span class="cx"> if ( $exclude_banned )
</span><span class="cx"> $banned_sql = $wpdb->prepare( " AND is_banned = 0" );
</span><span class="cx">
</span><del>- $members = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} {$pag_sql}", $group_id ) );
</del><ins>+ if ( bp_is_active( 'xprofile' ) )
+ $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} {$pag_sql}", $group_id ) );
+ else
+ $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u WHERE u.ID = m.user_id AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} {$pag_sql}", $group_id ) );
</ins><span class="cx">
</span><span class="cx"> if ( !$members )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (2548 => 2549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-02-02 22:09:12 UTC (rev 2548)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-02-02 22:19:14 UTC (rev 2549)
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> function bp_get_group_member_avatar() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'full' ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'full', 'email' => $members_template->member->user_email ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_avatar_thumb() {
</span><span class="lines">@@ -1363,7 +1363,7 @@
</span><span class="cx"> function bp_get_group_member_avatar_thumb() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb' ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb', 'email' => $members_template->member->user_email ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_avatar_mini( $width = 30, $height = 30 ) {
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx"> function bp_get_group_member_avatar_mini( $width = 30, $height = 30 ) {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_avatar_mini', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb', 'width' => $width, 'height' => $height ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_avatar_mini', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->user_id, 'type' => 'thumb', 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_name() {
</span><span class="lines">@@ -1381,7 +1381,7 @@
</span><span class="cx"> function bp_get_group_member_name() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_name', bp_core_get_user_displayname( $members_template->member->user_id ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_name', $members_template->member->display_name );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_url() {
</span><span class="lines">@@ -1390,7 +1390,7 @@
</span><span class="cx"> function bp_get_group_member_url() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_url', bp_core_get_userlink( $members_template->member->user_id, false, true ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_url', bp_core_get_user_domain( $members_template->member->user_id, $members_template->member->user_nicename, $members_template->member->user_login ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_link() {
</span><span class="lines">@@ -1399,7 +1399,7 @@
</span><span class="cx"> function bp_get_group_member_link() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_link', bp_core_get_userlink( $members_template->member->user_id ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_link', '<a href="' . bp_core_get_user_domain( $members_template->member->user_id, $members_template->member->user_nicename, $members_template->member->user_login ) . '">' . $members_template->member->display_name . '</a>' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_is_banned() {
</span><span class="lines">@@ -1408,7 +1408,7 @@
</span><span class="cx"> function bp_get_group_member_is_banned() {
</span><span class="cx"> global $members_template, $groups_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_is_banned', groups_is_user_banned( $members_template->member->user_id, $groups_template->group->id ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_is_banned', $members_template->member->is_banned );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_joined_since() {
</span><span class="lines">@@ -1417,7 +1417,7 @@
</span><span class="cx"> function bp_get_group_member_joined_since() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_joined_since', bp_core_get_last_activity( strtotime( $members_template->member->date_modified ), __( 'joined %s ago', 'buddypress') ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_joined_since', bp_core_get_last_activity( $members_template->member->date_modified, __( 'joined %s ago', 'buddypress') ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_id() {
</span></span></pre>
</div>
</div>
</body>
</html>