Ticket #4861: 4861.diff

bp-groups/bp-groups-admin.php

@@ -92 +92 @@
 
                 check_admin_referer( 'bp-groups-delete' );
 
-                $group_id = (int) $_GET['gid'];
+                $groups = explode( ',', $_GET['gid'] );
+                $result = false;
+                
+                // check for bulk deletion
+                if( is_array( $groups ) && count( $groups ) > 1 ) {
+                        
+                        foreach( $groups as $group_id ) {
+                                $result += intval( groups_delete_group( $group_id ) );
+                        }
+                        
+                } else {
+                        $group_id = intval( $groups[0] );
+                        
+                        $result = intval( groups_delete_group( $group_id ) );
+                }
 
-                $result = groups_delete_group( $group_id );
-
                 if ( $result ) {
-                        $redirect_to = add_query_arg( 'deleted', '1', $redirect_to );
+                        $redirect_to = add_query_arg( 'deleted', $result, $redirect_to );
                 } else {
                         $redirect_to = add_query_arg( array(
                                 'deleted' => 0,
@@ -409 +421 @@
 function bp_groups_admin() {
         // Decide whether to load the index or edit screen
         $doaction = ! empty( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
+        
+        /* 
+        at line 80 $_REQUEST['action'] = $_REQUEST['action2']; doesn't allow $doaction to be set as delete
+        in case of bulk actions
+        this is a quick and dirty fix :(
+        */
+        if( $doaction == -1 && $_GET['action'] == 'delete' && ! empty( $_GET['gid'] ) )
+                $doaction = $_GET['action'];
+        /* end of dirty fix */
 
         // Display the single group edit screen
         if ( 'edit' == $doaction && ! empty( $_GET['gid'] ) ) {
@@ -613 +634 @@
                 $deleted  = ! empty( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
 
                 if ( $deleted > 0 ) {
-                        $messages[] = sprintf( _n( '%s activity has been permanently deleted.', '%s activity items have been permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) );
+                        $messages[] = sprintf( _n( '%s group has been permanently deleted.', '%s groups have been permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) );
                 }
         }