<!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][10687] trunk: Make sure invites include an inviter_id.</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://buddypress.trac.wordpress.org/changeset/10687">10687</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10687","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-05 14:46:58 +0000 (Tue, 05 Apr 2016)</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'>Make sure invites include an inviter_id.
* When creating an invite, make sure that the
inviter_id is not 0.
* Add tests for empty values for `user_id`,
`group_id` and `inviter_id` in
`groups_send_invites()`.
Props danbrellis.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6941">#6941</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp">trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2016-03-31 18:48:23 UTC (rev 10686)
+++ trunk/src/bp-groups/bp-groups-functions.php 2016-04-05 14:46:58 UTC (rev 10687)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,8 +1100,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px"> extract( $args, EXTR_SKIP );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $user_id ) || empty( $group_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user_id || ! $group_id || ! $inviter_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the user has already requested membership, accept the request.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $membership_id = groups_check_for_membership_request( $user_id, $group_id ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2016-03-31 18:48:23 UTC (rev 10686)
+++ trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2016-04-05 14:46:58 UTC (rev 10687)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1086,6 +1086,70 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group groups_invite_user
+ * @group group_invitations
+ * @group group_membership
+ */
+ public function test_groups_send_invites_fail_on_empty_group_id() {
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+
+ // Create draft invitation with empty inviter_id
+ $invite_created = groups_invite_user( array(
+ 'user_id' => $u2,
+ 'group_id' => 0,
+ 'inviter_id' => $u1,
+ 'date_modified' => bp_core_current_time(),
+ 'is_confirmed' => 0
+ ) );
+
+ $this->assertFalse( $invite_created );
+ }
+
+ /**
+ * @group groups_invite_user
+ * @group group_invitations
+ * @group group_membership
+ */
+ public function test_groups_send_invites_fail_on_empty_user_id() {
+ $u1 = $this->factory->user->create();
+ $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+ // Create draft invitation with empty inviter_id
+ $invite_created = groups_invite_user( array(
+ 'user_id' => 0,
+ 'group_id' => $g1,
+ 'inviter_id' => $u1,
+ 'date_modified' => bp_core_current_time(),
+ 'is_confirmed' => 0
+ ) );
+
+ $this->assertFalse( $invite_created );
+ }
+
+ /**
+ * @group groups_invite_user
+ * @group group_invitations
+ * @group group_membership
+ */
+ public function test_groups_send_invites_fail_on_empty_inviter_id() {
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+ $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+ // Create draft invitation with empty inviter_id
+ $invite_created = groups_invite_user( array(
+ 'user_id' => $u2,
+ 'group_id' => $g1,
+ 'inviter_id' => 0,
+ 'date_modified' => bp_core_current_time(),
+ 'is_confirmed' => 0
+ ) );
+
+ $this->assertFalse( $invite_created );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group groups_send_membership_request
</span><span class="cx" style="display: block; padding: 0 10px"> * @group group_membership_requests
</span><span class="cx" style="display: block; padding: 0 10px"> * @group group_membership
</span></span></pre>
</div>
</div>
</body>
</html>