Ticket #8392: 8392.2.patch

src/bp-core/classes/class-bp-invitation-manager.php

@@ -611 +611 @@
          * @param int $id The ID of the invitation to mark as sent.
          * @return bool True on success, false on failure.
          */
-        abstract public function run_acceptance_action( $type = 'invite', $r  );
+        abstract public function run_acceptance_action( $type, $r  );
 
         /**
          * Mark invitation as accepted by invitation ID.

src/bp-groups/classes/class-bp-groups-invitation-manager.php

@@ -67 +67 @@
          * @param array  $r    Parameters that describe the invitation being accepted.
          * @return bool True on success, false on failure.
          */
-        public function run_acceptance_action( $type = 'invite', $r  ) {
+        public function run_acceptance_action( $type, $r ) {
+                if ( ! $type || ! in_array( $type, array( 'request', 'invite' ), true ) ) {
+                        return false;
+                }
+
                 // If the user is already a member (because BP at one point allowed two invitations to
                 // slip through), return early.
                 if ( groups_is_user_member( $r['user_id'], $r['item_id'] ) ) {

tests/phpunit/assets/invitations-extensions.php

@@ -12 +12 @@
                 return true;
         }
 
-        public function run_acceptance_action( $type = 'invite', $r  ) {
+        public function run_acceptance_action( $type, $r  ) {
                 return true;
         }
 }