<!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][9646] trunk: Bug fixes for `bp_group_status_message()`.</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/9646">9646</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/9646","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-25 19:54:28 +0000 (Wed, 25 Mar 2015)</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'>Bug fixes for `bp_group_status_message()`.
* The `$group` parameter passed to the function should be obeyed when doing invite/request checks. Note that this requires that the group objects have been generated with 'populate_extras', or the `is_invited` etc checks will result in false negatives.
* Insert missing `break` that was causing all the hidden group message to be shown for private groups.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6319">#6319</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/testcases/groups/template/</li>
<li><a href="#trunktestsphpunittestcasesgroupstemplatebpGroupStatusMessagephp">trunk/tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2015-03-24 23:26:11 UTC (rev 9645)
+++ trunk/src/bp-groups/bp-groups-template.php 2015-03-25 19:54:28 UTC (rev 9646)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3411,9 +3411,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Private group
</span><span class="cx" style="display: block; padding: 0 10px"> case 'private' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bp_group_has_requested_membership() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! bp_group_has_requested_membership( $group ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_group_is_invited() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_group_is_invited( $group ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'You must accept your pending invitation before you can access this private group.', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3425,10 +3425,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );
</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">+ break;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Hidden group
</span><span class="cx" style="display: block; padding: 0 10px"> case 'hidden' :
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'This is a hidden group and only invited members can join.', 'buddypress' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ break;
</ins><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></span></pre></div>
<a id="trunktestsphpunittestcasesgroupstemplatebpGroupStatusMessagephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php (rev 0)
+++ trunk/tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php 2015-03-25 19:54:28 UTC (rev 9646)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,162 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group groups
+ */
+class BP_Tests_Groups_Template_BpGroupStatusMessage extends BP_UnitTestCase {
+ private $current_user;
+ private $groups_template = null;
+
+ public function setUp() {
+ parent::setUp();
+ $this->current_user = bp_loggedin_user_id();
+ $this->set_current_user( 0 );
+
+ if ( isset( $GLOBALS['groups_template'] ) ) {
+ $this->groups_template = $GLOBALS['groups_template'];
+ }
+ }
+
+ public function tearDown() {
+ $this->set_current_user( $this->current_user );
+ if ( $this->groups_template ) {
+ $GLOBALS['groups_template'] = $this->groups_template;
+ }
+
+ parent::tearDown();
+ }
+
+ /**
+ * @group BP6319
+ */
+ public function test_private_group_where_logged_in_user_has_not_requested_membership_but_has_been_invited() {
+ $users = $this->factory->user->create_many( 2 );
+ $g = $this->factory->group->create( array( 'status' => 'private' ) );
+
+ $this->set_current_user( $users[0] );
+
+ groups_invite_user( array(
+ 'user_id' => $users[0],
+ 'group_id' => $g,
+ 'inviter_id' => $users[1],
+ ) );
+
+ if ( bp_has_groups( array( 'include' => array( $g ) ) ) ) {
+ while ( bp_groups() ) {
+ bp_the_group();
+ $found = get_echo( 'bp_group_status_message' );
+ }
+ }
+
+ $expected = __( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
+ $this->assertSame( $expected, $found );
+ }
+
+ /**
+ * @group BP6319
+ */
+ public function test_private_group_where_logged_in_user_has_not_requested_membership_and_has_not_been_invited() {
+ $u = $this->factory->user->create();
+ $g = $this->factory->group->create( array( 'status' => 'private' ) );
+
+ $this->set_current_user( $u );
+
+ if ( bp_has_groups( array( 'include' => array( $g ) ) ) ) {
+ while ( bp_groups() ) {
+ bp_the_group();
+ $found = get_echo( 'bp_group_status_message' );
+ }
+ }
+
+ $expected = __( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
+ $this->assertSame( $expected, $found );
+ }
+
+ /**
+ * @group BP6319
+ */
+ public function test_private_group_visited_by_a_non_logged_in_user() {
+ $g = $this->factory->group->create( array( 'status' => 'private' ) );
+
+ if ( bp_has_groups( array( 'include' => array( $g ) ) ) ) {
+ while ( bp_groups() ) {
+ bp_the_group();
+ $found = get_echo( 'bp_group_status_message' );
+ }
+ }
+
+ $expected = __( 'This is a private group. To join you must be a registered site member and request group membership.', 'buddypress' );
+ $this->assertSame( $expected, $found );
+ }
+
+ /**
+ * @group BP6319
+ */
+ public function test_private_group_where_loggedin_user_has_requested_membership() {
+ $u = $this->factory->user->create();
+ $g = $this->factory->group->create( array( 'status' => 'private' ) );
+
+ $this->set_current_user( $u );
+
+ groups_send_membership_request( $u, $g );
+
+ if ( bp_has_groups( array( 'include' => array( $g ) ) ) ) {
+ while ( bp_groups() ) {
+ bp_the_group();
+ $found = get_echo( 'bp_group_status_message' );
+ }
+ }
+
+ $expected = __( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );
+ $this->assertSame( $expected, $found );
+ }
+
+ /**
+ * @group BP6319
+ */
+ public function test_hidden_group() {
+ $u = $this->factory->user->create();
+ $g = $this->factory->group->create( array( 'status' => 'hidden' ) );
+
+ $this->set_current_user( $u );
+
+ $group = groups_get_group( array(
+ 'group_id' => $g,
+ 'populate_extras' => true,
+ ) );
+
+ $found = get_echo( 'bp_group_status_message', array( $group ) );
+
+ $expected = __( 'This is a hidden group and only invited members can join.', 'buddypress' );
+ $this->assertSame( $expected, $found );
+ }
+
+ /**
+ * @group BP6319
+ */
+ public function test_group_parameter_should_be_obeyed() {
+ $u = $this->factory->user->create();
+ $groups = $this->factory->group->create_many( 2, array( 'status' => 'private' ) );
+
+ $this->set_current_user( $u );
+
+ // Fake the current group.
+ $GLOBALS['groups_template'] = new stdClass;
+ $GLOBALS['groups_template']->group = groups_get_group( array(
+ 'group_id' => $groups[0],
+ 'populate_extras' => true,
+ ) );
+
+ groups_send_membership_request( $u, $groups[1] );
+
+ $group1 = groups_get_group( array(
+ 'group_id' => $groups[1],
+ 'populate_extras' => true,
+ ) );
+
+ $found = get_echo( 'bp_group_status_message', array( $group1 ) );
+
+ $expected = __( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );
+ $this->assertSame( $expected, $found );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>