<!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][9533] trunk: Use 'bp_member_member_type' as the member type cache bucket name.</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/9533">9533</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/9533","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-23 01:39:05 +0000 (Mon, 23 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'>Use 'bp_member_member_type' as the member type cache bucket name.
Using 'bp_member_type' was creating the potential for collisions between WP's
taxonomy cache (which uses the taxonomy name 'bp_member_type' and term IDs as
cache keys) and BP's per-member member type cache (which uses the bucket
'bp_member_type' and user IDs as cache keys). The collisions take place only
when there is a 'bp_member_type' term ID that overlaps with a user ID.
The new cache group 'bp_member_member_type' is chosen to underscore that what's
being cached is the relationship between individual members and the user types
to which they belong.
Props imath, johnjamesjacoby.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6242">#6242</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmemberscachephp">trunk/src/bp-members/bp-members-cache.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreclassbpuserqueryphp">trunk/tests/phpunit/testcases/core/class-bp-user-query.php</a></li>
<li><a href="#trunktestsphpunittestcasesmemberstypesphp">trunk/tests/phpunit/testcases/members/types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmemberscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-cache.php 2015-02-23 00:48:15 UTC (rev 9532)
+++ trunk/src/bp-members/bp-members-cache.php 2015-02-23 01:39:05 UTC (rev 9533)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param BP_User_Query $bp_user_query BP_User_Query object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_members_prefetch_member_type( BP_User_Query $bp_user_query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uncached_member_ids = bp_get_non_cached_ids( $bp_user_query->user_ids, 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uncached_member_ids = bp_get_non_cached_ids( $bp_user_query->user_ids, 'bp_member_member_type' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $member_types = bp_get_object_terms( $uncached_member_ids, 'bp_member_type', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_object_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,13 +32,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_member_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $keyed_member_types as $user_id => $user_member_types ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $user_id, $user_member_types, 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $user_id, $user_member_types, 'bp_member_member_type' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $cached_member_ids[] = $user_id;
</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"> // 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $no_type_id, '', 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $no_type_id, '', 'bp_member_member_type' );
</ins><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"> add_action( 'bp_user_query_populate_extras', 'bp_members_prefetch_member_type' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id ID of the deleted user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_members_clear_member_type_cache( $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $user_id, 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( $user_id, 'bp_member_member_type' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wpmu_delete_user', 'bp_members_clear_member_type_cache' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_user', 'bp_members_clear_member_type_cache' );
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php 2015-02-23 00:48:15 UTC (rev 9532)
+++ trunk/src/bp-members/bp-members-functions.php 2015-02-23 01:39:05 UTC (rev 9533)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2583,7 +2583,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bust the cache if the type has been updated.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $retval ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $user_id, 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( $user_id, 'bp_member_member_type' );
</ins><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"> * Fires just after a user's member type has been changed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2612,14 +2612,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * types (if $single is false). Returns false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_member_type( $user_id, $single = true ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $types = wp_cache_get( $user_id, 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $types = wp_cache_get( $user_id, 'bp_member_member_type' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $types ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $types = bp_get_object_terms( $user_id, 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $types = bp_get_object_terms( $user_id, 'bp_member_type' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $types ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $types = wp_list_pluck( $types, 'name' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( $user_id, $types, 'bp_member_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $user_id, $types, 'bp_member_member_type' );
</ins><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></span></pre></div>
<a id="trunktestsphpunittestcasescoreclassbpuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/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">--- trunk/tests/phpunit/testcases/core/class-bp-user-query.php 2015-02-23 00:48:15 UTC (rev 9532)
+++ trunk/tests/phpunit/testcases/core/class-bp-user-query.php 2015-02-23 01:39:05 UTC (rev 9533)
</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( 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' ) );
</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_member_type' ) );
+ $this->assertSame( array( 'bar' ), wp_cache_get( $users[1], 'bp_member_member_type' ) );
+ $this->assertSame( array( 'foo' ), wp_cache_get( $users[2], 'bp_member_member_type' ) );
+ $this->assertSame( '', wp_cache_get( $users[3], 'bp_member_member_type' ) );
</ins><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="trunktestsphpunittestcasesmemberstypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/members/types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/members/types.php 2015-02-23 00:48:15 UTC (rev 9532)
+++ trunk/tests/phpunit/testcases/members/types.php 2015-02-23 01:39:05 UTC (rev 9533)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,4 +205,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_get( $u, 'bp_member_type' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( bp_get_member_type( $u ) );
</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 BP6242
+ * @group cache
+ */
+ public function test_bp_get_member_type_should_not_conflict_with_term_cache() {
+ global $wpdb;
+
+ // Offset IDs.
+ $dummy_terms = $this->factory->tag->create_many( 5 );
+
+ $u1 = $this->factory->user->create();
+ bp_register_member_type( 'foo' );
+ bp_set_member_type( $u1, 'foo' );
+
+ // Fetch a term ID.
+ $terms = get_terms( 'bp_member_type', array( 'hide_empty' => false, 'fields' => 'all' ) );
+
+ // Make sure the user's ID matches a term ID, to force a cache confusion.
+ $u2 = $this->factory->user->create();
+ $new_user_id = $terms[0]->term_id;
+ $wpdb->update( $wpdb->users, array( 'ID' => $new_user_id ), array( 'ID' => $u2 ) );
+
+ bp_set_member_type( $new_user_id, 'foo' );
+
+ // Reprime the taxonomy cache.
+ $terms = get_terms( 'bp_member_type', array( 'hide_empty' => false, 'fields' => 'all' ) );
+
+ $this->assertSame( 'foo', bp_get_member_type( $new_user_id, true ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>