Changeset 2075 for branches/1.1/bp-groups.php

Timestamp:

11/02/2009 06:26:55 PM (17 years ago)

Author:

apeatling

Message:

Applying jjj trunk fixes to 1.1 branch.

File:

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

branches/1.1/bp-groups.php

@@ -545 +545 @@
         }
         
-        /* Group avatar is handled seperately */
+        /* Group avatar is handled separately */
         if ( 'group-avatar' == $bp->groups->current_create_step && isset( $_POST['upload'] ) ) {
                 if ( !empty( $_FILES ) && isset( $_POST['upload'] ) ) {
@@ -1154 +1154 @@
                 if ( 'demote' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
                         $user_id = $bp->action_variables[2];
+                        
+                        /* 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 demote yourself.', 'buddypress'), 'error' ); 
+                                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) ); 
+                        }               
 
                         /* Check the nonce first. */
@@ -1174 +1180 @@
                         $user_id = $bp->action_variables[2];
 
+                        /* 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 ban yourself.', 'buddypress'), 'error' ); 
+                                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) ); 
+                        }
+                        
                         /* Check the nonce first. */
                         if ( !check_admin_referer( 'groups_ban_member' ) )