Changeset 3178 for branches/1.2/bp-groups.php

Timestamp:

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

Author:

johnjamesjacoby

Message:

Fixes #2540 props boonebgorges

File:

• branches/1.2/bp-groups.php (modified) (3 diffs)

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 );