<!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][7237] trunk: Adds is_confirmed param to BP_Group_Member_Query, defaulting to true</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/7237">7237</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-06-24 18:59:22 +0000 (Mon, 24 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds is_confirmed param to BP_Group_Member_Query, defaulting to true
This additional parameter ensures that BP_Group_Member_Query distinguishes
between confirmed and unconfirmed members when pulling up lists of group
members.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5072">#5072</a>
Props Mike_Cowobo</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunktestsincludestestcasephp">trunk/tests/includes/testcase.php</a></li>
<li><a href="#trunkteststestcasesgroupsclassbpgroupmemberqueryphp">trunk/tests/testcases/groups/class-bp-group-member-query.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 (7236 => 7237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2013-06-24 15:35:18 UTC (rev 7236)
+++ trunk/bp-groups/bp-groups-classes.php 2013-06-24 18:59:22 UTC (rev 7237)
</span><span class="lines">@@ -987,8 +987,9 @@
</span><span class="cx"> // values passed to the constructor will, as usual, override
</span><span class="cx"> // these defaults).
</span><span class="cx"> $this->query_vars = wp_parse_args( $this->query_vars, array(
</span><del>- 'group_id' => 0,
- 'group_role' => array( 'member' ),
</del><ins>+ 'group_id' => 0,
+ 'group_role' => array( 'member' ),
+ 'is_confirmed' => true,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $group_member_ids = $this->get_group_member_ids();
</span><span class="lines">@@ -1026,8 +1027,13 @@
</span><span class="cx">
</span><span class="cx"> /** WHERE clauses *****************************************************/
</span><span class="cx">
</span><ins>+ // Group id
</ins><span class="cx"> $sql['where'][] = $wpdb->prepare( "group_id = %d", $this->query_vars['group_id'] );
</span><span class="cx">
</span><ins>+ // is_confirmed
+ $is_confirmed = ! empty( $this->query_vars['is_confirmed'] ) ? 1 : 0;
+ $sql['where'][] = $wpdb->prepare( "is_confirmed = %d", $is_confirmed );
+
</ins><span class="cx"> // Role information is stored as follows: admins have
</span><span class="cx"> // is_admin = 1, mods have is_mod = 1, banned have is_banned =
</span><span class="cx"> // 1, and members have all three set to 0.
</span></span></pre></div>
<a id="trunktestsincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/includes/testcase.php (7236 => 7237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/includes/testcase.php 2013-06-24 15:35:18 UTC (rev 7236)
+++ trunk/tests/includes/testcase.php 2013-06-24 18:59:22 UTC (rev 7237)
</span><span class="lines">@@ -226,6 +226,7 @@
</span><span class="cx"> public static function add_user_to_group( $user_id, $group_id, $args = array() ) {
</span><span class="cx"> $r = wp_parse_args( $args, array(
</span><span class="cx"> 'date_modified' => bp_core_current_time(),
</span><ins>+ 'is_confirmed' => 1,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $new_member = new BP_Groups_Member;
</span><span class="lines">@@ -235,7 +236,7 @@
</span><span class="cx"> $new_member->is_admin = 0;
</span><span class="cx"> $new_member->user_title = '';
</span><span class="cx"> $new_member->date_modified = $r['date_modified'];
</span><del>- $new_member->is_confirmed = 1;
</del><ins>+ $new_member->is_confirmed = $r['is_confirmed'];
</ins><span class="cx">
</span><span class="cx"> $new_member->save();
</span><span class="cx"> return $new_member->id;
</span></span></pre></div>
<a id="trunkteststestcasesgroupsclassbpgroupmemberqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/groups/class-bp-group-member-query.php (7236 => 7237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/groups/class-bp-group-member-query.php 2013-06-24 15:35:18 UTC (rev 7236)
+++ trunk/tests/testcases/groups/class-bp-group-member-query.php 2013-06-24 18:59:22 UTC (rev 7237)
</span><span class="lines">@@ -298,4 +298,27 @@
</span><span class="cx"> $this->assertEquals( array(), $ids );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public function test_confirmed_members() {
+ $g = $this->factory->group->create();
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+
+ $this->add_user_to_group( $u1, $g, array(
+ 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
+ 'is_confirmed' => 0,
+ ) );
+
+ $this->add_user_to_group( $u2, $g, array(
+ 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
+ 'is_confirmed' => 1,
+ ) );
+
+ $query_members = new BP_Group_Member_Query( array(
+ 'group_id' => $g,
+ ) );
+
+ $ids = wp_parse_id_list( array_keys( $query_members->results ) );
+ $this->assertEquals( array( $u2 ), $ids );
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>