Changeset 9448

Timestamp:

02/07/2015 08:34:31 PM (12 years ago)

Author:

boonebgorges

Message:

When prefetching member types in the loop, cache arrays instead of strings.

Member type caches should always be arrays of all member types for a user.

Props imath.
Fixes #6193 for the 2.2 branch.

Location:

branches/2.2

Files:

• src/bp-members/bp-members-cache.php (modified) (1 diff)
• tests/phpunit/testcases/core/class-bp-user-query.php (modified) (1 diff)
• tests/phpunit/testcases/members/types.php (modified) (1 diff)

branches/2.2/src/bp-members/bp-members-cache.php

@@ -21 +21 @@
         ) );
 
+        // Rekey by user ID.
+        $keyed_member_types = array();
+        foreach ( $member_types as $member_type ) {
+                if ( ! isset( $keyed_member_types[ $member_type->object_id ] ) ) {
+                        $keyed_member_types[ $member_type->object_id ] = array();
+                }
+
+                $keyed_member_types[ $member_type->object_id ][] = $member_type->name;
+        }
+
         $cached_member_ids = array();
-        foreach ( $member_types as $member_type ) {
-                wp_cache_set( $member_type->object_id, $member_type->name, 'bp_member_type' );
-                $cached_member_ids[] = $member_type->object_id;
+        foreach ( $keyed_member_types as $user_id => $user_member_types ) {
+                wp_cache_set( $user_id, $user_member_types, 'bp_member_type' );
+                $cached_member_ids[] = $user_id;
         }
 

branches/2.2/tests/phpunit/testcases/core/class-bp-user-query.php

@@ -515 +515 @@
                 ) );
 
-                $this->assertSame( 'foo', wp_cache_get( $users[0], 'bp_member_type' ) );
-                $this->assertSame( 'bar', wp_cache_get( $users[1], 'bp_member_type' ) );
-                $this->assertSame( 'foo', wp_cache_get( $users[2], 'bp_member_type' ) );
+                $this->assertSame( array( 'foo' ), wp_cache_get( $users[0], 'bp_member_type' ) );
+                $this->assertSame( array( 'bar' ), wp_cache_get( $users[1], 'bp_member_type' ) );
+                $this->assertSame( array( 'foo' ), wp_cache_get( $users[2], 'bp_member_type' ) );
                 $this->assertSame( '', wp_cache_get( $users[3], 'bp_member_type' ) );
         }

branches/2.2/tests/phpunit/testcases/members/types.php

@@ -163 +163 @@
 
         /**
+         * @group BP6193
+         */
+        public function test_bp_members_prefetch_member_type_array_cache_set() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                bp_register_member_type( 'foo' );
+                bp_register_member_type( 'bar' );
+                bp_set_member_type( $u1, 'foo' );
+                bp_set_member_type( $u1, 'bar', true );
+
+                // Get users so that the 'bp_user_query_populate_extras' is fired
+                // and members type prefetched
+                $users = bp_core_get_users( array( 'include' => array( $u1, $u2 ) ) );
+
+                // Get single member type
+                $this->assertSame( 'foo', bp_get_member_type( $u1, true ) );
+                $this->assertEmpty( bp_get_member_type( $u2, true ) );
+
+                // Get all member types for the user
+                $this->assertEqualSets( array( 'foo', 'bar' ), bp_get_member_type( $u1, false ) );
+                $this->assertEmpty( bp_get_member_type( $u2, false ) );
+        }
+
+        /**
          * @group cache
          */