<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][9448] branches/2.2: When prefetching member types in the loop, cache arrays instead of strings.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9448">9448</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9448","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-07 20:34:31 +0000 (Sat, 07 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/6193">#6193</a> for the 2.2 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches22srcbpmembersbpmemberscachephp">branches/2.2/src/bp-members/bp-members-cache.php</a></li>
<li><a href="#branches22testsphpunittestcasescoreclassbpuserqueryphp">branches/2.2/tests/phpunit/testcases/core/class-bp-user-query.php</a></li>
<li><a href="#branches22testsphpunittestcasesmemberstypesphp">branches/2.2/tests/phpunit/testcases/members/types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches22srcbpmembersbpmemberscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.2/src/bp-members/bp-members-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.2/src/bp-members/bp-members-cache.php 2015-02-07 20:32:55 UTC (rev 9447)
+++ branches/2.2/src/bp-members/bp-members-cache.php 2015-02-07 20:34:31 UTC (rev 9448)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,12 +20,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cached_member_ids = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Rekey by user ID.
+ $keyed_member_types = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $member_types as $member_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $member_type->object_id, $member_type->name, 'bp_member_type' );
- $cached_member_ids[] = $member_type->object_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cached_member_ids = array();
+ 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Cache an empty value for users with no type.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_diff( $uncached_member_ids, $cached_member_ids ) as $no_type_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $no_type_id, '', 'bp_member_type' );
</span></span></pre></div>
<a id="branches22testsphpunittestcasescoreclassbpuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.2/tests/phpunit/testcases/core/class-bp-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.2/tests/phpunit/testcases/core/class-bp-user-query.php 2015-02-07 20:32:55 UTC (rev 9447)
+++ branches/2.2/tests/phpunit/testcases/core/class-bp-user-query.php 2015-02-07 20:34:31 UTC (rev 9448)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,9 +514,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $users,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', wp_cache_get( $users[3], 'bp_member_type' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches22testsphpunittestcasesmemberstypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.2/tests/phpunit/testcases/members/types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.2/tests/phpunit/testcases/members/types.php 2015-02-07 20:32:55 UTC (rev 9447)
+++ branches/2.2/tests/phpunit/testcases/members/types.php 2015-02-07 20:34:31 UTC (rev 9448)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,6 +162,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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 ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group cache
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_get_member_type_should_return_false_for_deleted_user() {
</span></span></pre>
</div>
</div>
</body>
</html>