Ticket #6090: 6090.02-formatting-only.patch

src/bp-groups/bp-groups-functions.php

@@ -400 +400 @@
 function groups_join_group( $group_id, $user_id = 0 ) {
         global $bp;
 
-        if ( empty( $user_id ) )
+        if ( empty( $user_id ) ) {
                 $user_id = bp_loggedin_user_id();
+        }
 
         // Check if the user has an outstanding invite. If so, delete it.
-        if ( groups_check_user_has_invite( $user_id, $group_id ) )
+        if ( groups_check_user_has_invite( $user_id, $group_id ) ) {
                 groups_delete_invite( $user_id, $group_id );
+        }
 
         // Check if the user has an outstanding request. If so, delete it.
-        if ( groups_check_for_membership_request( $user_id, $group_id ) )
+        if ( groups_check_for_membership_request( $user_id, $group_id ) ) {
                 groups_delete_membership_request( null, $user_id, $group_id );
+        }
 
         // User is already a member, just return true
-        if ( groups_is_user_member( $user_id, $group_id ) )
+        if ( groups_is_user_member( $user_id, $group_id ) ) {
                 return true;
+        }
 
         $new_member                = new BP_Groups_Member;
         $new_member->group_id      = $group_id;
@@ -424 +428 @@
         $new_member->date_modified = bp_core_current_time();
         $new_member->is_confirmed  = 1;
 
-        if ( !$new_member->save() )
+        if ( !$new_member->save() ) {
                 return false;
+        }
 
-        if ( !isset( $bp->groups->current_group ) || !$bp->groups->current_group || $group_id != $bp->groups->current_group->id )
+        if ( !isset( $bp->groups->current_group ) || !$bp->groups->current_group || $group_id != $bp->groups->current_group->id ) {
                 $group = groups_get_group( array( 'group_id' => $group_id ) );
-        else
+        } else {
                 $group = $bp->groups->current_group;
+        }
 
         // Record this in activity streams
         groups_record_activity( array(
@@ -1217 +1223 @@
 function groups_send_membership_request( $requesting_user_id, $group_id ) {
 
         // Prevent duplicate requests
-        if ( groups_check_for_membership_request( $requesting_user_id, $group_id ) )
+        if ( groups_check_for_membership_request( $requesting_user_id, $group_id ) ) {
                 return false;
+        }
 
         // Check if the user is already a member or is banned
-        if ( groups_is_user_member( $requesting_user_id, $group_id ) || groups_is_user_banned( $requesting_user_id, $group_id ) )
+        if ( groups_is_user_member( $requesting_user_id, $group_id ) || groups_is_user_banned( $requesting_user_id, $group_id ) ) {
                 return false;
+        }
 
         // Check if the user is already invited - if so, simply accept invite
         if ( groups_check_user_has_invite( $requesting_user_id, $group_id ) ) {
@@ -1323 +1331 @@
  * @return bool True on success, false on failure.
  */
 function groups_delete_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
-        if ( !empty( $user_id ) && !empty( $group_id ) )
+        if ( ! empty( $user_id ) && ! empty( $group_id ) ) {
                 $membership = new BP_Groups_Member( $user_id, $group_id );
-        else
+        } else {
                 $membership = new BP_Groups_Member( false, false, $membership_id );
+        }
 
-        if ( !BP_Groups_Member::delete_request( $membership->user_id, $membership->group_id ) )
+        if ( ! BP_Groups_Member::delete_request( $membership->user_id, $membership->group_id ) ) {
                 return false;
+        }
 
         return $membership;
 }