Changeset 2114 for trunk/bp-groups.php

Timestamp:

11/24/2009 10:05:01 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch fixes into trunk.

File:

• trunk/bp-groups.php (modified) (6 diffs)

trunk/bp-groups.php

@@ -821 +821 @@
 
         if ( $bp->is_single_item ) {
-                if ( 'post' == $wire_action && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                if ( 'post' == $wire_action && ( is_site_admin() || groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ) {
                         /* Check the nonce first. */
                         if ( !check_admin_referer( 'bp_wire_post' ) )
@@ -836 +836 @@
                                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
 
-                } else if ( 'delete' == $wire_action && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
+                } else if ( 'delete' == $wire_action && ( is_site_admin() || groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ) {
                         $wire_message_id = $bp->action_variables[1];
 
@@ -912 +912 @@
         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 ) );
+                                }
                         }
 
@@ -1810 +1811 @@
                 $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 ) )
@@ -1834 +1831 @@
         if ( groups_check_user_has_invite( $user_id, $group_id ) )
                 groups_delete_invite( $user_id, $group_id );
+
+        if ( !$bp->groups->current_group )
+                $bp->groups->current_group = new BP_Groups_Group( $group_id, false, false );
 
         $new_member = new BP_Groups_Member;
@@ -1852 +1852 @@
                 'primary_link' => apply_filters( 'groups_activity_joined_group_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
                 'component_action' => 'joined_group',
-                'item_id' => $bp->groups->current_group->id
+                'item_id' => $group_id
         ) );