Changeset 13239

Timestamp:

02/20/2022 05:59:15 PM (4 years ago)

Author:

imath

Message:

Make sure member has a type before trying to remove one

Avoid a PHP Type error if the member has no member types and the Administrator (or more probably a plugin) tries to remove it.

Props sx1001

See #8639 (trunk)

Location:

trunk

Files:

• src/bp-members/bp-members-functions.php (modified) (1 diff)
• tests/phpunit/testcases/members/types.php (modified) (1 diff)

trunk/src/bp-members/bp-members-functions.php

@@ -3166 +3166 @@
     // No need to continue if the member doesn't have the type.
     $existing_types = bp_get_member_type( $user_id, false );
-    if ( ! in_array( $member_type, $existing_types, true ) ) {
+    if ( ! is_array( $existing_types ) || ! in_array( $member_type, $existing_types, true ) ) {
         return false;
     }

trunk/tests/phpunit/testcases/members/types.php

@@ -345 +345 @@
 
     /**
+     * @ticket BP8639
+     */
+    public function test_bp_remove_member_type_should_return_false_when_user_has_no_member_type() {
+        $u1 = self::factory()->user->create();
+        bp_register_member_type( 'random' );
+
+        $this->assertFalse( bp_remove_member_type( $u1, 'random' ) );
+    }
+
+    /**
      * @group BP6138
      */