Changeset 11045

Timestamp:

08/30/2016 06:39:57 PM (10 years ago)

Author:

dcavins

Message:

Return active types only in bp_get_member_type().

When compiling the array of types for the member in
bp_get_member_type(), only include those types that are currently
registered.

Fixes #7225.

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

@@ -2748 +2748 @@
 
         if ( false === $types ) {
-                $types = bp_get_object_terms( $user_id, 'bp_member_type' );
-
-                if ( ! is_wp_error( $types ) ) {
-                        $types = wp_list_pluck( $types, 'name' );
+                $raw_types = bp_get_object_terms( $user_id, 'bp_member_type' );
+
+                if ( ! is_wp_error( $raw_types ) ) {
+                        $types =  array();
+
+                        // Only include currently registered group types.
+                        foreach ( $raw_types as $mtype ) {
+                                if ( bp_get_member_type_object( $mtype->name ) ) {
+                                        $types[] = $mtype->name;
+                                }
+                        }
+
                         wp_cache_set( $user_id, $types, 'bp_member_member_type' );
                 }

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

@@ -393 +393 @@
                 $this->assertEqualSets( array( 'bar', 'foo' ), $types );
         }
+
+        public function test_bp_get_member_type_should_not_return_unregistered_types() {
+                $u1 = $this->factory->user->create();
+                bp_register_member_type( 'foo' );
+                bp_set_member_type( $u1, 'foo' );
+
+                // Directly set a type that hasn't been registered.
+                bp_set_object_terms( $u1, 'ugh', 'bp_member_type', true );
+
+                $type = bp_get_member_type( $u1, false );
+                $this->assertEquals( array( 'foo' ), $type );
+        }
 }