Changeset 2556

Timestamp:

02/03/2010 10:44:26 AM (14 years ago)

Author:

apeatling

Message:

Fixes #1777

Location:

trunk

Files:

• bp-groups.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (5 diffs)
• bp-groups/bp-groups-notifications.php (modified) (2 diffs)

trunk/bp-groups.php

@@ -2257 +2257 @@
     do_action( 'groups_ban_member', $user_id, $group_id );
 
-    return $member->ban();
+    if ( !$member->ban() )
+        return false;
+
+    update_usermeta( $user_id, 'total_group_count', (int)$total_count - 1 );
 }
 

trunk/bp-groups/bp-groups-classes.php

@@ -121 +121 @@
         global $wpdb, $bp;
 
-        // Delete groupmeta for the group
+        /* Delete groupmeta for the group */
         groups_delete_groupmeta( $this->id );
 
-        // Modify group count usermeta for members
-        for ( $i = 0; $i < count($this->user_dataset); $i++ ) {
-            $user = $this->user_dataset[$i];
-
-            $total_count = get_usermeta( $user->user_id, 'total_group_count' );
-
-            if ( $total_count != '' ) {
-                update_usermeta( $user->user_id, 'total_group_count', (int)$total_count - 1 );
-            }
-
-            // Now delete the group member record
-            BP_Groups_Member::delete( $user->user_id, $this->id, false );
-        }
+        /* Fetch the user IDs of all the members of the group */
+        $user_ids = BP_Groups_Member::get_group_member_ids( $this->id );
+        $user_ids = implode( ',', (array)$user_ids );
+
+        /* Modify group count usermeta for members */
+        $wpdb->query( $wpdb->prepare( "UPDATE {$bp->groups->table_name_groupmeta} SET meta_value = meta_value - 1 WHERE meta_key = 'total_group_count' AND user_id IN ( {$user_ids} )" ) );
+
+        /* Now delete all group member entries */
+        BP_Groups_Member::delete_all( $this->id );
 
         do_action( 'bp_groups_delete_group', $this );
@@ -724 +720 @@
         groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
 
+        $group_count = get_usermeta( $this->user_id, 'total_group_count' );
+        if ( !empty( $group_count ) )
+            update_usermeta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
+
         return $this->save();
     }
@@ -734 +734 @@
 
         groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) + 1 ) );
+        update_usermeta( $this->user_id, 'total_group_count', (int)get_usermeta( $this->user_id, 'total_group_count' ) + 1 );
 
         return $this->save();
@@ -936 +937 @@
             return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY rand() LIMIT $total_groups", $user_id ) );
         }
+    }
+
+    function get_group_member_ids( $group_id ) {
+        global $bp, $wpdb;
+
+        return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 AND is_banned = 0", $group_id ) );
     }
 
@@ -996 +1003 @@
 
         return array( 'members' => $members, 'count' => $total_member_count );
+    }
+
+    function delete_all( $group_id ) {
+        global $wpdb, $bp;
+
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE group_id = %d", $group_id ) );
     }
 

trunk/bp-groups/bp-groups-notifications.php

@@ -7 +7 @@
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . __( 'Group Details Updated', 'buddypress' );
 
-    foreach ( $group->user_dataset as $user ) {
-        if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_group_updated' ) ) continue;
-
-        $ud = bp_core_get_core_userdata( $user->user_id );
+    $user_ids = BP_Groups_Member::get_group_member_ids( $this->id );
+    foreach ( $user_ids as $user_id ) {
+        if ( 'no' == get_usermeta( $user_id, 'notification_groups_group_updated' ) ) continue;
+
+        $ud = bp_core_get_core_userdata( $user_id );
 
         // Set up and send the message
@@ -16 +17 @@
 
         $group_link = site_url( $bp->groups->slug . '/' . $group->slug );
-        $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
+        $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications/';
 
         $message = sprintf( __(