Changeset 11046

Timestamp:

08/30/2016 06:44:51 PM (8 years ago)

Author:

dcavins

Message:

Return active types only in bp_groups_get_group_type().

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

Fixes #7224.

Location:

trunk

Files:

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

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

@@ -2296 +2296 @@
 
     if ( false === $types ) {
-        $types = bp_get_object_terms( $group_id, 'bp_group_type' );
-
-        if ( ! is_wp_error( $types ) ) {
-            $types = wp_list_pluck( $types, 'name' );
+        $raw_types = bp_get_object_terms( $group_id, 'bp_group_type' );
+
+        if ( ! is_wp_error( $raw_types ) ) {
+            $types = array();
+
+            // Only include currently registered group types.
+            foreach ( $raw_types as $gtype ) {
+                if ( bp_groups_get_group_type_object( $gtype->name ) ) {
+                    $types[] = $gtype->name;
+                }
+            }
+
             wp_cache_set( $group_id, $types, 'bp_groups_group_type' );
         }

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

@@ -252 +252 @@
         $this->assertEqualSets( array( 'bar' ), $types );
     }
+
+    public function test_groups_get_type_should_not_return_unregistered_types() {
+        $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
+        bp_groups_register_group_type( 'foo' );
+        bp_groups_set_group_type( $g, 'foo' );
+
+        // Directly set a type that hasn't been registered.
+        bp_set_object_terms( $g, 'ugh', 'bp_group_type', true );
+
+        $type = bp_groups_get_group_type( $g, false );
+        $this->assertEquals( array( 'foo' ), $type );
+    }
 }