<!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] [3178] branches/1.2: Fixes #2540 props boonebgorges</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3178</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-11 23:25:11 +0000 (Wed, 11 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2540 props boonebgorges</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpgroupsbpgroupstemplatetagsphp">branches/1.2/bp-groups/bp-groups-templatetags.php</a></li>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
<li><a href="#branches12bpthemesbpdefaultgroupssingleforumtopicphp">branches/1.2/bp-themes/bp-default/groups/single/forum/topic.php</a></li>
<li><a href="#branches12bpthemesbpdefaultgroupssingleforumphp">branches/1.2/bp-themes/bp-default/groups/single/forum.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups/bp-groups-templatetags.php (3177 => 3178)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups/bp-groups-templatetags.php 2010-08-11 23:08:55 UTC (rev 3177)
+++ branches/1.2/bp-groups/bp-groups-templatetags.php 2010-08-11 23:25:11 UTC (rev 3178)
</span><span class="lines">@@ -560,6 +560,12 @@
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_groups_auto_join() {
+ global $bp;
+
+ return (bool)$bp->groups->auto_join;
+}
+
</ins><span class="cx"> function bp_group_total_members() {
</span><span class="cx"> echo bp_get_group_total_members();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (3177 => 3178)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-08-11 23:08:55 UTC (rev 3177)
+++ branches/1.2/bp-groups.php 2010-08-11 23:25:11 UTC (rev 3178)
</span><span class="lines">@@ -96,6 +96,9 @@
</span><span class="cx">
</span><span class="cx"> $bp->groups->valid_status = apply_filters( 'groups_valid_status', array( 'public', 'private', 'hidden' ) );
</span><span class="cx">
</span><ins>+ // Auto join group when non group member performs group activity
+ $bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
+
</ins><span class="cx"> do_action( 'groups_setup_globals' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_globals', 'groups_setup_globals' );
</span><span class="lines">@@ -364,7 +367,7 @@
</span><span class="cx"> check_admin_referer( 'bp_forums_new_reply' );
</span><span class="cx">
</span><span class="cx"> /* Auto join this user if they are not yet a member of this group */
</span><del>- if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
</del><ins>+ if ( $bp->groups->auto_join && !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
</ins><span class="cx"> groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
</span><span class="cx">
</span><span class="cx"> if ( !$post_id = groups_new_group_forum_post( $_POST['reply_text'], $topic_id, $_GET['topic_page'] ) )
</span><span class="lines">@@ -542,7 +545,7 @@
</span><span class="cx"> check_admin_referer( 'bp_forums_new_topic' );
</span><span class="cx">
</span><span class="cx"> /* Auto join this user if they are not yet a member of this group */
</span><del>- if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
</del><ins>+ if ( $bp->groups->auto_join && !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
</ins><span class="cx"> groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
</span><span class="cx">
</span><span class="cx"> if ( !$topic = groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id ) )
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultgroupssingleforumtopicphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/groups/single/forum/topic.php (3177 => 3178)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/groups/single/forum/topic.php 2010-08-11 23:08:55 UTC (rev 3177)
+++ branches/1.2/bp-themes/bp-default/groups/single/forum/topic.php 2010-08-11 23:25:11 UTC (rev 3178)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> <div id="post-topic-reply">
</span><span class="cx"> <p id="post-reply"></p>
</span><span class="cx">
</span><del>- <?php if ( !bp_group_is_member() ) : ?>
</del><ins>+ <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
</ins><span class="cx"> <p><?php _e( 'You will auto join this group when you reply to this topic.', 'buddypress' ) ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultgroupssingleforumphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/groups/single/forum.php (3177 => 3178)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/groups/single/forum.php 2010-08-11 23:08:55 UTC (rev 3177)
+++ branches/1.2/bp-themes/bp-default/groups/single/forum.php 2010-08-11 23:25:11 UTC (rev 3178)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_forum_post_new' ) ?>
</span><span class="cx">
</span><del>- <?php if ( !bp_group_is_member() ) : ?>
</del><ins>+ <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
</ins><span class="cx"> <p><?php _e( 'You will auto join this group when you start a new topic.', 'buddypress' ) ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>