Changeset 11969 for trunk/src/bp-templates/bp-legacy/buddypress-functions.php

Timestamp:

04/13/2018 02:01:08 PM (7 years ago)

Author:

dcavins

Message:

Allow pending invite to be cancelled without friendship requirement.

BP Legacy's function bp_legacy_theme_ajax_invite_user() was built to stop early if the invitee was not a friend of the inviter. In the case where you extend an invitation to a user, then cancel your friendship, you were prevented from running the uninvite task. This patch removes the friendship check from the uninvite task.

Props r-a-y.

Fixes #7726.

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1328 +1328 @@
         return;
 
-    if ( ! friends_check_friendship( bp_loggedin_user_id(), $_POST['friend_id'] ) )
-        return;
-
     $group_id = (int) $_POST['group_id'];
     $friend_id = (int) $_POST['friend_id'];
 
     if ( 'invite' == $_POST['friend_action'] ) {
+        if ( ! friends_check_friendship( bp_loggedin_user_id(), $_POST['friend_id'] ) ) {
+            return;
+        }
+
         $group = groups_get_group( $group_id );