Changeset 2110

Timestamp:

11/24/2009 03:52:00 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1351

File:

• branches/1.1/bp-groups.php (modified) (2 diffs)

branches/1.1/bp-groups.php

@@ -910 +910 @@
     if ( $bp->is_single_item ) {
         if ( isset($bp->action_variables) && 'yes' == $bp->action_variables[0] ) {
-
             // Check if the user is the group admin first.
-            if ( groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
-                bp_core_add_message(  __('As the only group administrator, you cannot leave this group.', 'buddypress'), 'error' );
-                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+            if ( count( groups_get_group_admins( $bp->groups->current_group->id ) ) < 2 ) {
+                if ( groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                    bp_core_add_message(  __('As the only group administrator, you cannot leave this group.', 'buddypress'), 'error' );
+                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+                }
             }
 
@@ -1796 +1797 @@
         $user_id = $bp->loggedin_user->id;
 
-    // Admins cannot leave a group, that is until promotion to admin support is implemented.
-    if ( groups_is_user_admin( $user_id, $group_id ) )
-        return false;
-
     // This is exactly the same as deleting and invite, just is_confirmed = 1 NOT 0.
     if ( !groups_uninvite_user( $user_id, $group_id, true ) )