Ticket #6462: 6462.03.patch

src/bp-groups/classes/class-bp-groups-member.php

@@ -733 +733 @@
 
                 $bp = buddypress();
 
-                return $wpdb->query( $wpdb->prepare( "DELETE 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 ) );
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0", $user_id, $group_id ) );
         }
 
         /**

tests/phpunit/testcases/groups/class-bp-groups-member.php

@@ -445 +445 @@
          * @group group_invitations
          * @group group_membership
          */
+        public function test_bp_groups_delete_invite_remove_draft_invite() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $g = $this->factory->group->create( array(
+                        'status' => 'private',
+                ) );
+
+                $now = time();
+                $this->add_user_to_group( $u1, $g, array(
+                        'date_modified' => date( 'Y-m-d H:i:s', $now - 60 ),
+                ) );
+
+                // Create the draft invitation.
+                $args = array(
+                        'user_id'       => $u2,
+                        'group_id'      => $g,
+                        'inviter_id'    => $u1
+                );
+                groups_invite_user( $args );
+                // Check that the invite got created.
+                $u2_has_invite = groups_check_user_has_invite( $u2, $g, $type = 'all' );
+                $this->assertTrue( is_numeric( $u2_has_invite ) && $u2_has_invite > 0 );
+
+                // The invitation should be removed.
+                groups_delete_invite( $u2, $g );
+                $u2_has_invite = groups_check_user_has_invite( $u2, $g, $type = 'all' );
+                $this->assertEquals( 0, $u2_has_invite );
+        }
+
+        /**
+         * @group groups_delete_invite
+         * @group group_invitations
+         * @group group_membership
+         */
         public function test_bp_groups_delete_invite_leave_memberships_intact() {
                 $u1 = $this->factory->user->create();
                 $g = $this->factory->group->create( array(