<!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] [2954] branches/1.2/bp-groups.php:
Fixes #2329 props boonebgorges</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2954</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-26 23:43:08 +0000 (Mon, 26 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2329 props boonebgorges</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (2953 => 2954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-04-26 23:22:07 UTC (rev 2953)
+++ branches/1.2/bp-groups.php 2010-04-26 23:43:08 UTC (rev 2954)
</span><span class="lines">@@ -1184,13 +1184,23 @@
</span><span class="cx"> if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != 'join' )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // user wants to join a group
</del><ins>+ // Skip if banned or already a member
</ins><span class="cx"> if ( !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) && !groups_is_user_banned( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
</span><del>- if ( !groups_join_group($bp->groups->current_group->id) ) {
- bp_core_add_message( __('There was an error joining the group.', 'buddypress'), 'error' );
- } else {
- bp_core_add_message( __('You joined the group!', 'buddypress') );
</del><ins>+
+ // User wants to join a group that is not public
+ if ( $bp->groups->current_group->status != 'public' ) {
+ if ( !groups_check_user_has_invite( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+ bp_core_add_message( __( 'There was an error joining the group.', 'buddypress' ), 'error' );
+ bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+ }
</ins><span class="cx"> }
</span><ins>+
+ // User wants to join any group
+ if ( !groups_join_group( $bp->groups->current_group->id ) )
+ bp_core_add_message( __( 'There was an error joining the group.', 'buddypress' ), 'error' );
+ else
+ bp_core_add_message( __( 'You joined the group!', 'buddypress' ) );
+
</ins><span class="cx"> bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>