Changeset 10278

Timestamp:

10/14/2015 06:24:29 PM (11 years ago)

Author:

dcavins

Message:

Modify delete method in groups_leave_group().

Using groups_remove_member() in
groups_leave_group() led to confusion
in the action hooks that are called.
This change reverts the change in r9811
to avoid this problem.

Props thebrandonallen, r-a-y.

Fixes #6597.

File:

• trunk/src/bp-groups/bp-groups-functions.php (modified) (2 diffs)

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

@@ -440 +440 @@
         }
 
-        if ( ! groups_remove_member( $user_id, $group_id ) ) {
+        if ( ! BP_Groups_Member::delete( $user_id, $group_id ) ) {
                 return false;
         }
@@ -1435 +1435 @@
 
         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 );