Changeset 4324 for trunk/bp-groups/bp-groups-functions.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-functions.php (modified) (2 diffs)

trunk/bp-groups/bp-groups-functions.php

@@ -525 +525 @@
         return false;
 
-    if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id ) ) {
+    if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id, 'all' ) ) {
         $invite                = new BP_Groups_Member;
         $invite->group_id      = $group_id;
@@ -628 +628 @@
 }
 
-function groups_check_user_has_invite( $user_id, $group_id ) {
-    return BP_Groups_Member::check_has_invite( $user_id, $group_id );
+/**
+ * Check to see whether a user has already been invited to a group
+ *
+ * By default, the function checks for invitations that have been sent. Entering 'all' as the $type
+ * parameter will return unsent invitations as well (useful to make sure AJAX requests are not
+ * duplicated)
+ *
+ * @package BuddyPress Groups
+ *
+ * @param int $user_id Potential group member
+ * @param int $group_id Potential group
+ * @param str $type Optional. Use 'sent' to check for sent invites, 'all' to check for all
+ * @return bool Returns true if an invitation is found
+ */
+function groups_check_user_has_invite( $user_id, $group_id, $type = 'sent' ) {
+    return BP_Groups_Member::check_has_invite( $user_id, $group_id, $type );
 }