Changeset 3178

Timestamp:

08/11/2010 11:25:11 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2540 props boonebgorges

Location:

branches/1.2

Files:

• bp-groups.php (modified) (3 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/forum.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/forum/topic.php (modified) (1 diff)

branches/1.2/bp-groups.php

@@ -97 +97 @@
     $bp->groups->valid_status = apply_filters( 'groups_valid_status', array( 'public', 'private', 'hidden' ) );
 
+    // Auto join group when non group member performs group activity
+    $bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
+
     do_action( 'groups_setup_globals' );
 }
@@ -365 +368 @@
 
                 /* Auto join this user if they are not yet a member of this group */
-                if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                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 ) )
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
 
@@ -543 +546 @@
 
                 /* Auto join this user if they are not yet a member of this group */
-                if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                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 ) )
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
 

branches/1.2/bp-groups/bp-groups-templatetags.php

@@ -559 +559 @@
     echo sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
     <span class="ajax-loader"></span><?php
+}
+
+function bp_groups_auto_join() {
+    global $bp;
+
+    return (bool)$bp->groups->auto_join;
 }
 

branches/1.2/bp-themes/bp-default/groups/single/forum.php

@@ -26 +26 @@
                 <?php do_action( 'bp_before_group_forum_post_new' ) ?>
 
-                <?php if ( !bp_group_is_member() ) : ?>
+                <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
                     <p><?php _e( 'You will auto join this group when you start a new topic.', 'buddypress' ) ?></p>
                 <?php endif; ?>

branches/1.2/bp-themes/bp-default/groups/single/forum/topic.php

@@ -84 +84 @@
                         <p id="post-reply"></p>
 
-                        <?php if ( !bp_group_is_member() ) : ?>
+                        <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
                             <p><?php _e( 'You will auto join this group when you reply to this topic.', 'buddypress' ) ?></p>
                         <?php endif; ?>