Changeset 6912

Timestamp:

04/15/2013 11:56:38 PM (12 years ago)

Author:

boonebgorges

Message:

Don't redirect immediately after attempting to remove all admins from a group

On the original implementation, when you attempted to remove all admins from a
group via the Dashboard panel, you were immediately redirected away from the
screen, without the rest of the script being processed. This meant, in
particular, that the bp_group_admin_edit_after action was not run, with the
result that plugins weren't able to save their options properly in this
scenario.

This changeset modifies the process so that, in the case of this kind of error,
the redirection doesn't happen until the end of the form handler, allowing
plugins to hook into the save routine correctly.

Fixes #4930

File:

• trunk/bp-groups/bp-groups-admin.php (modified) (1 diff)

trunk/bp-groups/bp-groups-admin.php

@@ -260 +260 @@
 
             if ( ! $admin_count ) {
+
                 $redirect_to = add_query_arg( 'no_admins', 1, $redirect_to );
-                bp_core_redirect( $redirect_to );
-            }
-
-            // Process only those users who have had their roles changed
-            foreach ( (array) $_POST['bp-groups-role'] as $user_id => $new_role ) {
-
-                $existing_role = isset( $_POST['bp-groups-existing-role'][$user_id] ) ? $_POST['bp-groups-existing-role'][$user_id] : '';
-
-                if ( $existing_role != $new_role ) {
-
-                    switch ( $new_role ) {
-                        case 'mod' :
-                            // Admin to mod is a demotion. Demote to
-                            // member, then fall through
-                            if ( 'admin' == $existing_role ) {
-                                groups_demote_member( $user_id, $group_id );
-                            }
-
-                        case 'admin' :
-                            // If the user was banned, we must
-                            // unban first
-                            if ( 'banned' == $existing_role ) {
-                                groups_unban_member( $user_id, $group_id );
-                            }
-
-                            // At this point, each existing_role
-                            // is a member, so promote
-                            $result = groups_promote_member( $user_id, $group_id, $new_role );
-
-                            break;
-
-                        case 'member' :
-
-                            if ( 'admin' == $existing_role || 'mod' == $existing_role ) {
-                                $result = groups_demote_member( $user_id, $group_id );
-                            } else if ( 'banned' == $existing_role ) {
-                                $result = groups_unban_member( $user_id, $group_id );
-                            }
-
-                            break;
-
-                        case 'banned' :
-
-                            $result = groups_ban_member( $user_id, $group_id );
-
-                            break;
-
-                        case 'remove' :
-
-                            $result = groups_remove_member( $user_id, $group_id );
-
-                            break;
-                    }
-
-                    // Store the success or failure
-                    if ( $result ) {
-                        $success_modified[] = $user_id;
-                    } else {
-                        $error_modified[]   = $user_id;
+                $error = $group_id;
+
+            } else {
+
+                // Process only those users who have had their roles changed
+                foreach ( (array) $_POST['bp-groups-role'] as $user_id => $new_role ) {
+
+                    $existing_role = isset( $_POST['bp-groups-existing-role'][$user_id] ) ? $_POST['bp-groups-existing-role'][$user_id] : '';
+
+                    if ( $existing_role != $new_role ) {
+
+                        switch ( $new_role ) {
+                            case 'mod' :
+                                // Admin to mod is a demotion. Demote to
+                                // member, then fall through
+                                if ( 'admin' == $existing_role ) {
+                                    groups_demote_member( $user_id, $group_id );
+                                }
+
+                            case 'admin' :
+                                // If the user was banned, we must
+                                // unban first
+                                if ( 'banned' == $existing_role ) {
+                                    groups_unban_member( $user_id, $group_id );
+                                }
+
+                                // At this point, each existing_role
+                                // is a member, so promote
+                                $result = groups_promote_member( $user_id, $group_id, $new_role );
+
+                                break;
+
+                            case 'member' :
+
+                                if ( 'admin' == $existing_role || 'mod' == $existing_role ) {
+                                    $result = groups_demote_member( $user_id, $group_id );
+                                } else if ( 'banned' == $existing_role ) {
+                                    $result = groups_unban_member( $user_id, $group_id );
+                                }
+
+                                break;
+
+                            case 'banned' :
+
+                                $result = groups_ban_member( $user_id, $group_id );
+
+                                break;
+
+                            case 'remove' :
+
+                                $result = groups_remove_member( $user_id, $group_id );
+
+                                break;
+                        }
+
+                        // Store the success or failure
+                        if ( $result ) {
+                            $success_modified[] = $user_id;
+                        } else {
+                            $error_modified[]   = $user_id;
+                        }
                     }
                 }