<!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][7791] trunk/bp-xprofile: Improve cache invalidation for xprofile groups</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7791">7791</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-05 19:16:55 +0000 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve cache invalidation for xprofile groups
XProfile groups are cached in two ways: individually and as a collection. This
changeset improves group cache invalidation by ensuring that both of these
caches are wiped when child fields are added or edited.
See <a href="http://buddypress.trac.wordpress.org/ticket/1332">#1332</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofilecachephp">trunk/bp-xprofile/bp-xprofile-cache.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofilecachephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-cache.php (7790 => 7791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-cache.php 2014-02-05 18:53:33 UTC (rev 7790)
+++ trunk/bp-xprofile/bp-xprofile-cache.php 2014-02-05 19:16:55 UTC (rev 7791)
</span><span class="lines">@@ -17,8 +17,8 @@
</span><span class="cx"> wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
</span><span class="cx"> wp_cache_delete( 'xprofile_group_' . $group_obj->id, 'bp' );
</span><span class="cx"> }
</span><del>-add_action( 'xprofile_groups_deleted_group', 'xprofile_clear_profile_groups_object_cache' );
-add_action( 'xprofile_groups_saved_group', 'xprofile_clear_profile_groups_object_cache' );
</del><ins>+add_action( 'xprofile_group_after_delete', 'xprofile_clear_profile_groups_object_cache' );
+add_action( 'xprofile_group_after_save', 'xprofile_clear_profile_groups_object_cache' );
</ins><span class="cx">
</span><span class="cx"> function xprofile_clear_profile_data_object_cache( $group_id ) {
</span><span class="cx"> wp_cache_delete( 'bp_user_fullname_' . bp_loggedin_user_id(), 'bp' );
</span><span class="lines">@@ -35,6 +35,12 @@
</span><span class="cx"> function xprofile_clear_profile_field_object_cache( $field_obj ) {
</span><span class="cx"> // Clear default visibility level cache
</span><span class="cx"> wp_cache_delete( 'xprofile_default_visibility_levels', 'bp' );
</span><ins>+
+ // Modified fields can alter parent group status, in particular when
+ // the group goes from empty to non-empty. Bust its cache, as well as
+ // the global group_inc_empty cache
+ wp_cache_delete( 'xprofile_group_' . $field_obj->group_id, 'bp' );
+ wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'xprofile_fields_saved_field', 'xprofile_clear_profile_field_object_cache' );
</span><span class="cx"> add_action( 'xprofile_fields_deleted_field', 'xprofile_clear_profile_field_object_cache' );
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (7790 => 7791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2014-02-05 18:53:33 UTC (rev 7790)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2014-02-05 19:16:55 UTC (rev 7791)
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> if ( empty( $this->can_delete ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ do_action_ref_array( 'xprofile_group_before_delete', array( &$this ) );
+
</ins><span class="cx"> // Delete field group
</span><span class="cx"> if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id ) ) ) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -88,6 +90,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ do_action_ref_array( 'xprofile_group_after_delete', array( &$this ) );
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>