<!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][7616] trunk/bp-groups/bp-groups-classes.php: Refactor get_group_extras logic in group loops</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/7616">7616</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-11-29 19:37:58 +0000 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor get_group_extras logic in group loops
The previous logic made it so that is_pending, is_invited, and is_member
values were only set in the case where users had a membership for the group
in the database. This could result in PHP warnings in certain cases, and in
all cases results in inconsistent data structures between member and non-member
groups within group loops.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5269">#5269</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.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 (7615 => 7616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2013-11-29 19:35:20 UTC (rev 7615)
+++ trunk/bp-groups/bp-groups-classes.php 2013-11-29 19:37:58 UTC (rev 7616)
</span><span class="lines">@@ -854,31 +854,37 @@
</span><span class="cx"> $group_ids = implode( ',', wp_parse_id_list( $group_ids ) );
</span><span class="cx">
</span><span class="cx"> // Fetch the logged-in user's status within each group
</span><del>- $user_status = $wpdb->get_results( $wpdb->prepare( "SELECT group_id, is_confirmed, invite_sent FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_banned = 0", bp_loggedin_user_id() ) );
</del><ins>+ $user_status_results = $wpdb->get_results( $wpdb->prepare( "SELECT group_id, is_confirmed, invite_sent FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_banned = 0", bp_loggedin_user_id() ) );
</ins><span class="cx">
</span><ins>+ // Reindex
+ $user_status = array();
+ foreach ( $user_status_results as $user_status_result ) {
+ $user_status[ $user_status_result->group_id ] = $user_status_result;
+ }
+
</ins><span class="cx"> for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
</span><del>- foreach ( (array) $user_status as $group ) {
- if ( $group->group_id == $paged_groups[ $i ]->id ) {
- $is_member = $is_invited = $is_pending = '0';
</del><ins>+ $is_member = $is_invited = $is_pending = '0';
+ $gid = $paged_groups[ $i ]->id;
</ins><span class="cx">
</span><del>- // is_confirmed means the user is a member
- if ( $group->is_confirmed ) {
- $is_member = '1';
</del><ins>+ if ( isset( $user_status[ $gid ] ) ) {
</ins><span class="cx">
</span><del>- // invite_sent means the user has been invited
- } else if ( $group->invite_sent ) {
- $is_invited = '1';
</del><ins>+ // is_confirmed means the user is a member
+ if ( $user_status[ $gid ]->is_confirmed ) {
+ $is_member = '1';
</ins><span class="cx">
</span><del>- // User has sent request, but has not been confirmed
- } else {
- $is_pending = '1';
- }
</del><ins>+ // invite_sent means the user has been invited
+ } else if ( $user_status[ $gid ]->invite_sent ) {
+ $is_invited = '1';
</ins><span class="cx">
</span><del>- $paged_groups[ $i ]->is_member = $is_member;
- $paged_groups[ $i ]->is_invited = $is_invited;
- $paged_groups[ $i ]->is_pending = $is_pending;
</del><ins>+ // User has sent request, but has not been confirmed
+ } else {
+ $is_pending = '1';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ $paged_groups[ $i ]->is_member = $is_member;
+ $paged_groups[ $i ]->is_invited = $is_invited;
+ $paged_groups[ $i ]->is_pending = $is_pending;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $user_banned = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE is_banned = 1 AND user_id = %d AND group_id IN ( {$group_ids} )", bp_loggedin_user_id() ) );
</span></span></pre>
</div>
</div>
</body>
</html>