Changeset 9811

Timestamp:

04/27/2015 07:10:10 PM (9 years ago)

Author:

dcavins

Message:

Use groups_remove_member in groups_leave_group.

Also change groups_remove_member() to allow it
to work in situations where bp_is_item_admin
may not be true.

See #6209.

Location:

trunk

Files:

• src/bp-groups/bp-groups-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/groups/functions.php (modified) (1 diff)

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

@@ -432 +432 @@
     }
 
-    // This is exactly the same as deleting an invite, just is_confirmed = 1 NOT 0.
-    if ( !groups_uninvite_user( $user_id, $group_id ) ) {
+    if ( ! groups_remove_member( $user_id, $group_id ) ) {
         return false;
     }
@@ -1406 +1405 @@
 function groups_remove_member( $user_id, $group_id ) {
 
-    if ( ! bp_is_item_admin() )
-        return false;
+    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;
+            }
+    }
 
     $member = new BP_Groups_Member( $user_id, $group_id );

trunk/tests/phpunit/testcases/groups/functions.php

@@ -38 +38 @@
         groups_join_group( $g2, $u2 );
 
+        // Set the current user so the leave group request goes through.
+        $this->set_current_user( $u2 );
         groups_leave_group( $g1, $u2 );
         $this->assertEquals( 1, bp_get_user_meta( $u2, 'total_group_count', true ) );