Changeset 4324 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

05/02/2011 08:55:26 PM (14 years ago)

Author:

boonebgorges

Message:

Fixes group invitations so that they work when JavaScript is disabled. Fixes #2245. Moves bp_groups_sent_invited_email hook inside invitation loop so that it's actually sent for each invited member.

File:

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

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

@@ -889 +889 @@
     }
 
-    function check_has_invite( $user_id, $group_id ) {
+    function check_has_invite( $user_id, $group_id, $type = 'sent' ) {
         global $wpdb, $bp;
 
         if ( !$user_id )
             return false;
-
-        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
+        
+        $sql = "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0";
+        
+        if ( 'sent' == $type )
+            $sql .= " AND invite_sent = 1";
+
+        return $wpdb->get_var( $wpdb->prepare( $sql, $user_id, $group_id ) );
     }