<!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][7773] trunk/bp-activity: Fix persistent caching for BP_Activity_Activity::get_activity_comments()</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/7773">7773</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-03 02:43:51 +0000 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix persistent caching for BP_Activity_Activity::get_activity_comments()
- Use the 'bp' cache group consistently
- When a query shows that an activity item has no comments, do not cache the
boolean value false. This will cause a cache miss the next time around.
Instead, store the string 'none', and then convert it to false when
requerying.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5369">#5369</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (7772 => 7773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2014-02-03 02:35:17 UTC (rev 7772)
+++ trunk/bp-activity/bp-activity-classes.php 2014-02-03 02:43:51 UTC (rev 7773)
</span><span class="lines">@@ -867,8 +867,16 @@
</span><span class="cx"> $top_level_parent_id = $activity_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !$comments = wp_cache_get( 'bp_activity_comments_' . $activity_id ) ) {
</del><ins>+ $comments = wp_cache_get( 'bp_activity_comments_' . $activity_id, 'bp' );
</ins><span class="cx">
</span><ins>+ // We store the string 'none' to cache the fact that the
+ // activity item has no comments
+ if ( 'none' === $comments ) {
+ $comments = false;
+
+ // A true cache miss
+ } else if ( empty( $comments ) ) {
+
</ins><span class="cx"> // Select the user's fullname with the query
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span><span class="cx"> $fullname_select = ", pd.value as user_fullname";
</span><span class="lines">@@ -911,7 +919,18 @@
</span><span class="cx"> $ref[ $d->id ] =& $comments[ $d->id ];
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- wp_cache_set( 'bp_activity_comments_' . $activity_id, $comments, 'bp' );
</del><ins>+
+ // If we cache a value of false, it'll count as a cache
+ // miss the next time the activity comments are fetched.
+ // Storing the string 'none' is a hack workaround to
+ // avoid unnecessary queries.
+ if ( false === $comments ) {
+ $cache_value = 'none';
+ } else {
+ $cache_value = $comments;
+ }
+
+ wp_cache_set( 'bp_activity_comments_' . $activity_id, $cache_value, 'bp' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $comments;
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (7772 => 7773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2014-02-03 02:35:17 UTC (rev 7772)
+++ trunk/bp-activity/bp-activity-functions.php 2014-02-03 02:43:51 UTC (rev 7773)
</span><span class="lines">@@ -1252,7 +1252,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Clear the comment cache for this activity
</span><del>- wp_cache_delete( 'bp_activity_comments_' . $parent_id );
</del><ins>+ wp_cache_delete( 'bp_activity_comments_' . $parent_id, 'bp' );
</ins><span class="cx">
</span><span class="cx"> do_action( 'bp_activity_comment_posted', $comment_id, $params, $activity );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>