Changeset 1202

Timestamp:

03/10/2009 03:58:09 AM (18 years ago)

Author:

apeatling

Message:

Fixed bug where email notifications of group invites would be sent multiple times.

Location:

trunk

Files:

• bp-groups.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (3 diffs)

trunk/bp-groups.php

@@ -1740 +1740 @@
         for ( $i = 0; $i < count( $invited_users ); $i++ ) {
                 $member = new BP_Groups_Member( $invited_users[$i], $group_obj->id );
+                
+                // Send the actual invite
+                groups_notification_group_invites( $group_obj, $member, $bp->loggedin_user->id );
+                
                 $member->invite_sent = 1;
                 $member->save();
         }
-
-        groups_notification_group_invites( $group_obj->id, $invited_users, $bp->loggedin_user->id );
         
         do_action( 'groups_send_invites', $group_obj->id, $invited_users );

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

@@ -222 +222 @@
 add_action( 'groups_promoted_member', 'groups_notification_promoted_member', 10, 2 );
 
-function groups_notification_group_invites( $group_id, $invited_user_ids, $inviter_user_id ) {
+function groups_notification_group_invites( &$group, &$member, $inviter_user_id ) {
         global $bp;
         
@@ -229 +229 @@
         $inviter_link = site_url() . '/' . MEMBERS_SLUG . '/' . $inviter_ud->user_login;
         
-        $group = new BP_Groups_Group( $group_id, false, false );
         $group_link = bp_group_permalink( $group, false );
-                
-        for ( $i = 0; $i < count( $invited_user_ids ); $i++ ) {
-                $invited_user_id = $invited_user_ids[$i];
+        
+        if ( !$member->invite_sent ) {
+                $invited_user_id = $member->user_id;
 
                 // Post a screen notification first.
-                bp_core_add_notification( $group_id, $invited_user_id, 'groups', 'group_invite' );
+                bp_core_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' );
 
                 if ( 'no' == get_usermeta( $invited_user_id, 'notification_groups_invite' ) ) continue;
@@ -244 +243 @@
                 $invited_link = site_url() . '/' . MEMBERS_SLUG . '/' . $invited_ud->user_login;
                 $invites_link = $invited_link . '/' . $bp->groups->slug . '/invites';
-                
+
                 // Set up and send the message
                 $to = $invited_ud->user_email;