<!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][7997] trunk/bp-activity: Properly set object cache for a new BP_Activity_Activity object.</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/7997">7997</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-02-27 19:48:22 +0000 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly set object cache for a new BP_Activity_Activity object.
This commit also renames the activity cache key and group to be
consistent with the groups component. (See <a href="http://buddypress.trac.wordpress.org/changeset/7956">r7956</a>.)
See <a href="http://buddypress.trac.wordpress.org/ticket/5434">#5434</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitycachephp">trunk/bp-activity/bp-activity-cache.php</a></li>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitycachephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-cache.php (7996 => 7997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-cache.php 2014-02-26 22:35:16 UTC (rev 7996)
+++ trunk/bp-activity/bp-activity-cache.php 2014-02-27 19:48:22 UTC (rev 7997)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> * @param BP_Activity_Activity $activity
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_clear_cache_for_activity( $activity ) {
</span><del>- wp_cache_delete( 'activity_' . $activity->id, 'bp' );
</del><ins>+ wp_cache_delete( $activity->id, 'bp_activity' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_activity_after_save', 'bp_activity_clear_cache_for_activity' );
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_clear_cache_for_deleted_activity( $deleted_ids ) {
</span><span class="cx"> foreach ( (array) $deleted_ids as $deleted_id ) {
</span><del>- wp_cache_delete( 'activity_' . $deleted_id, 'bp' );
</del><ins>+ wp_cache_delete( $deleted_id, 'bp_activity' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_activity_deleted_activities', 'bp_activity_clear_cache_for_deleted_activity' );
</span></span></pre></div>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (7996 => 7997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2014-02-26 22:35:16 UTC (rev 7996)
+++ trunk/bp-activity/bp-activity-classes.php 2014-02-27 19:48:22 UTC (rev 7997)
</span><span class="lines">@@ -137,10 +137,12 @@
</span><span class="cx"> public function populate() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $row = wp_cache_get( 'activity_' . $this->id, 'bp' );
</del><ins>+ $row = wp_cache_get( $this->id, 'bp_activity' );
</ins><span class="cx">
</span><span class="cx"> if ( false === $row ) {
</span><span class="cx"> $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
</span><ins>+
+ wp_cache_set( $this->id, $row, 'bp_activity' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $row ) ) {
</span><span class="lines">@@ -474,7 +476,7 @@
</span><span class="cx"> foreach ( $activity_ids as $activity_id ) {
</span><span class="cx">
</span><span class="cx"> // If cached data is found, use it
</span><del>- if ( $activity_data = wp_cache_get( 'activity_' . $activity_id, 'bp' ) ) {
</del><ins>+ if ( $activity_data = wp_cache_get( $activity_id, 'bp_activity' ) ) {
</ins><span class="cx"> $activities[ $activity_id ] = $activity_data;
</span><span class="cx">
</span><span class="cx"> // Otherwise leave a placeholder so we don't lose the order
</span><span class="lines">@@ -498,7 +500,7 @@
</span><span class="cx"> // and add it to the cache
</span><span class="cx"> foreach ( (array) $queried_adata as $adata ) {
</span><span class="cx"> $activities[ $adata->id ] = $adata;
</span><del>- wp_cache_set( 'activity_' . $adata->id, $adata, 'bp' );
</del><ins>+ wp_cache_set( $adata->id, $adata, 'bp_activity' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>