Ticket #6597: 6597.03.patch

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

@@ -439 +439 @@
                 }
         }
 
-        if ( ! groups_remove_member( $user_id, $group_id ) ) {
+        if ( ! BP_Groups_Member::delete( $user_id, $group_id ) ) {
                 return false;
         }
 
@@ -1434 +1434 @@
 function groups_remove_member( $user_id, $group_id ) {
 
         if ( ! bp_is_item_admin() ) {
-                // bp_is_item_admin may not be set if this function is called outside of group context.
-                // Site admins and group admins can remove a member from a group.
-                // A member may also request to remove herself from a group.
-                if ( ! current_user_can( 'bp_moderate' )
-                        && ! groups_is_user_admin( bp_loggedin_user_id(), $group_id )
-                        && $user_id != bp_loggedin_user_id() ) {
-                                return false;
-                        }
-        }
+                return false;
+        }
 
         $member = new BP_Groups_Member( $user_id, $group_id );