Changeset 12600

Timestamp:

03/28/2020 09:20:53 PM (6 years ago)

Author:

boonebgorges

Message:

Members: Don't attempt to remove member type terms when they don't match.

Attempting to use WP's taxonomy functions to remove non-existent terms
can trigger errors in PHP 7.4+.

See #8264.

File:

• trunk/src/bp-members/bp-members-functions.php (modified) (1 diff)

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

@@ -2723 +2723 @@
     }
 
+    // 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 ) ) {
+        return false;
+    }
+
     $deleted = bp_remove_object_terms( $user_id, $member_type, bp_get_member_type_tax_name() );