Changeset 2339 for trunk/bp-groups.php

Timestamp:

01/18/2010 03:52:16 PM (15 years ago)

Author:

apeatling

Message:

Fixes to group invite interface and template loop.

File:

• trunk/bp-groups.php (modified) (3 diffs)

trunk/bp-groups.php

@@ -2261 +2261 @@
 /*** Group Invitations *********************************************************/
 
-function groups_get_invites_for_user( $user_id = false ) {
+function groups_get_invites_for_user( $user_id = false, $limit = false, $page = false ) {
     global $bp;
 
@@ -2267 +2267 @@
         $user_id = $bp->loggedin_user->id;
 
-    return BP_Groups_Member::get_invites( $user_id );
+    return BP_Groups_Member::get_invites( $user_id, $limit, $page );
 }
 
@@ -2287 +2287 @@
         return false;
 
-    if ( groups_is_user_member( $user_id, $group_id ) )
-        return false;
-
-    $invite = new BP_Groups_Member;
-    $invite->group_id = $group_id;
-    $invite->user_id = $user_id;
-    $invite->date_modified = $date_modified;
-    $invite->inviter_id = $inviter_id;
-    $invite->is_confirmed = $is_confirmed;
-
-    if ( !$invite->save() )
-        return false;
-
-    do_action( 'groups_invite_user', $args );
+    if ( !groups_is_user_member( $user_id, $group_id ) && !groups_check_user_has_invite( $user_id, $group_id ) ) {
+        $invite = new BP_Groups_Member;
+        $invite->group_id = $group_id;
+        $invite->user_id = $user_id;
+        $invite->date_modified = $date_modified;
+        $invite->inviter_id = $inviter_id;
+        $invite->is_confirmed = $is_confirmed;
+
+        if ( !$invite->save() )
+            return false;
+
+        do_action( 'groups_invite_user', $args );
+    }
 
     return true;