Changeset 5181

Timestamp:

09/24/2011 02:52:23 AM (13 years ago)

Author:

boonebgorges

Message:

Ensures that bp_groups_auto_join() defaults to false; switches global check with bp_groups_auto_join() check. See #3610. Props r-a-y

Location:

branches/1.5/bp-groups

Files:

• bp-groups-loader.php (modified) (1 diff)
• bp-groups-screens.php (modified) (2 diffs)

branches/1.5/bp-groups/bp-groups-loader.php

@@ -216 +216 @@
 
         // Auto join group when non group member performs group activity
-        $this->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' );
+        $this->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) && BP_DISABLE_AUTO_GROUP_JOIN ? false : true;
     }
 

branches/1.5/bp-groups/bp-groups-screens.php

@@ -141 +141 @@
 
                 // Auto join this user if they are not yet a member of this group
-                if ( $bp->groups->auto_join && !is_super_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_super_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 );
 
@@ -338 +338 @@
                     $error_message = __( "You have been banned from this group.", 'buddypress' );
 
-                } elseif ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                } elseif ( bp_groups_auto_join() && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
                     // Auto join this user if they are not yet a member of this group
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );