<!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][7905] trunk: Introduce 'update_meta_cache' param to bp_has_activities() stack</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/7905">7905</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-17 01:02:25 +0000 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce 'update_meta_cache' param to bp_has_activities() stack
See <a href="http://buddypress.trac.wordpress.org/ticket/5398">#5398</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>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkteststestcasesactivitytemplatephp">trunk/tests/testcases/activity/template.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 (7904 => 7905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2014-02-17 00:42:05 UTC (rev 7904)
+++ trunk/bp-activity/bp-activity-classes.php 2014-02-17 01:02:25 UTC (rev 7905)
</span><span class="lines">@@ -248,6 +248,8 @@
</span><span class="cx"> * @type bool $show_hidden Whether to show items marked hide_sitewide.
</span><span class="cx"> * Default: false.
</span><span class="cx"> * @type string $spam Spam status. Default: 'ham_only'.
</span><ins>+ * @type bool $update_meta_cache Whether to pre-fetch metadata for
+ * queried activity items. Default: true.
</ins><span class="cx"> * }
</span><span class="cx"> * @return array The array returned has two keys:
</span><span class="cx"> * - 'total' is the count of located activities
</span><span class="lines">@@ -430,7 +432,7 @@
</span><span class="cx"> $activity_ids[] = $activity->id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $activity_ids ) ) {
</del><ins>+ if ( ! empty( $activity_ids ) && $update_meta_cache ) {
</ins><span class="cx"> bp_activity_update_meta_cache( $activity_ids );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (7904 => 7905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2014-02-17 00:42:05 UTC (rev 7904)
+++ trunk/bp-activity/bp-activity-functions.php 2014-02-17 01:02:25 UTC (rev 7905)
</span><span class="lines">@@ -910,6 +910,7 @@
</span><span class="cx"> 'exclude' => false, // Comma-separated list of activity IDs to exclude
</span><span class="cx"> 'in' => false, // Comma-separated list or array of activity IDs to which you want to limit the query
</span><span class="cx"> 'spam' => 'ham_only', // 'ham_only' (default), 'spam_only' or 'all'.
</span><ins>+ 'update_meta_cache' => true,
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Pass filters as an array -- all filter items can be multiple values comma separated:
</span><span class="lines">@@ -939,7 +940,8 @@
</span><span class="cx"> 'filter' => $filter,
</span><span class="cx"> 'display_comments' => $display_comments,
</span><span class="cx"> 'show_hidden' => $show_hidden,
</span><del>- 'spam' => $spam
</del><ins>+ 'spam' => $spam,
+ 'update_meta_cache' => $update_meta_cache,
</ins><span class="cx"> );
</span><span class="cx"> $activity = BP_Activity_Activity::get( $args );
</span><span class="cx"> wp_cache_set( 'bp_activity_sitewide_front', $activity, 'bp' );
</span><span class="lines">@@ -980,7 +982,7 @@
</span><span class="cx"> * All arguments and defaults are shared with BP_Activity_Activity::get(),
</span><span class="cx"> * except for the following:
</span><span class="cx"> * @type string|int|array Single activity ID, comma-separated list of IDs,
</span><del>- * or array of IDs.
</del><ins>+ * or array of IDs.
</ins><span class="cx"> * }
</span><span class="cx"> * @return array $activity See BP_Activity_Activity::get() for description.
</span><span class="cx"> */
</span><span class="lines">@@ -994,6 +996,7 @@
</span><span class="cx"> 'show_hidden' => true, // When fetching specific items, show all
</span><span class="cx"> 'sort' => 'DESC', // sort ASC or DESC
</span><span class="cx"> 'spam' => 'ham_only', // Retrieve items marked as spam
</span><ins>+ 'update_meta_cache' => true,
</ins><span class="cx"> );
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="lines">@@ -1006,7 +1009,8 @@
</span><span class="cx"> 'display_comments' => $display_comments,
</span><span class="cx"> 'show_hidden' => $show_hidden,
</span><span class="cx"> 'in' => $activity_ids,
</span><del>- 'spam' => $spam
</del><ins>+ 'spam' => $spam,
+ 'update_meta_cache' => $update_meta_cache,
</ins><span class="cx"> );
</span><span class="cx"> return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get( $get_args ), $args, $get_args );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (7904 => 7905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2014-02-17 00:42:05 UTC (rev 7904)
+++ trunk/bp-activity/bp-activity-template.php 2014-02-17 01:02:25 UTC (rev 7905)
</span><span class="lines">@@ -173,6 +173,7 @@
</span><span class="cx"> 'display_comments' => 'threaded',
</span><span class="cx"> 'show_hidden' => false,
</span><span class="cx"> 'spam' => 'ham_only',
</span><ins>+ 'update_meta_cache' => true,
</ins><span class="cx"> );
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span><span class="lines">@@ -188,11 +189,11 @@
</span><span class="cx">
</span><span class="cx"> // Fetch specific activity items based on ID's
</span><span class="cx"> if ( !empty( $include ) )
</span><del>- $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments, 'show_hidden' => $show_hidden, 'spam' => $spam ) );
</del><ins>+ $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments, 'show_hidden' => $show_hidden, 'spam' => $spam, 'update_meta_cache' => $update_meta_cache, ) );
</ins><span class="cx">
</span><span class="cx"> // Fetch all activity items
</span><span class="cx"> else
</span><del>- $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'meta_query' => $meta_query, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude, 'in' => $in, 'spam' => $spam ) );
</del><ins>+ $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'meta_query' => $meta_query, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude, 'in' => $in, 'spam' => $spam, 'update_meta_cache' => $update_meta_cache, ) );
</ins><span class="cx">
</span><span class="cx"> if ( !$max || $max >= (int) $this->activities['total'] )
</span><span class="cx"> $this->total_activity_count = (int) $this->activities['total'];
</span><span class="lines">@@ -448,6 +449,8 @@
</span><span class="cx"> * which he is a member
</span><span class="cx"> * @type string|bool $spam Spam status. 'ham_only', 'spam_only', or false
</span><span class="cx"> * to show all activity regardless of spam status. Default: 'ham_only'.
</span><ins>+ * @type bool $populate_extras Whether to pre-fetch the activity metadata
+ * for the queried items. Default: true.
</ins><span class="cx"> * }
</span><span class="cx"> * @return bool Returns true when activities are found, otherwise false.
</span><span class="cx"> */
</span><span class="lines">@@ -519,7 +522,8 @@
</span><span class="cx"> 'meta_query' => false, // filter on activity meta. See WP_Meta_Query for format
</span><span class="cx">
</span><span class="cx"> // Searching
</span><del>- 'search_terms' => false // specify terms to search on
</del><ins>+ 'search_terms' => false, // specify terms to search on
+ 'update_meta_cache' => true,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -626,7 +630,8 @@
</span><span class="cx"> 'meta_query' => $meta_query,
</span><span class="cx"> 'display_comments' => $display_comments,
</span><span class="cx"> 'show_hidden' => $show_hidden,
</span><del>- 'spam' => $spam
</del><ins>+ 'spam' => $spam,
+ 'update_meta_cache' => $update_meta_cache,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $activities_template = new BP_Activity_Template( $template_args );
</span></span></pre></div>
<a id="trunkteststestcasesactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/activity/template.php (7904 => 7905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/activity/template.php 2014-02-17 00:42:05 UTC (rev 7904)
+++ trunk/tests/testcases/activity/template.php 2014-02-17 01:02:25 UTC (rev 7905)
</span><span class="lines">@@ -253,4 +253,58 @@
</span><span class="cx"> $this->assertEquals( array( $a1, $a2 ), $ids );
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group bp_has_activities
+ * @group cache
+ */
+ public function test_bp_has_activities_with_update_meta_cache_false() {
+ $now = time();
+ $a1 = $this->factory->activity->create( array(
+ 'content' => 'Life Rules',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'content' => 'Life Drools',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+ ) );
+
+ bp_activity_add_meta( $a1, 'foo', 'bar' );
+ bp_activity_add_meta( $a2, 'foo1', 'bar2' );
+
+ // prime
+ bp_has_activities( array(
+ 'update_meta_cache' => false,
+ ) );
+
+ $this->assertFalse( wp_cache_get( $a1, 'activity_meta' ) );
+ $this->assertFalse( wp_cache_get( $a2, 'activity_meta' ) );
+ }
+
+ /**
+ * @group bp_has_activities
+ * @group cache
+ */
+ public function test_bp_has_activities_with_update_meta_cache_true() {
+ $now = time();
+ $a1 = $this->factory->activity->create( array(
+ 'content' => 'Life Rules',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'content' => 'Life Drools',
+ 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+ ) );
+
+ bp_activity_add_meta( $a1, 'foo', 'bar' );
+ bp_activity_add_meta( $a2, 'foo1', 'bar2' );
+
+ // prime
+ bp_has_activities( array(
+ 'update_meta_cache' => true,
+ ) );
+
+ $this->assertNotEmpty( wp_cache_get( $a1, 'activity_meta' ) );
+ $this->assertNotEmpty( wp_cache_get( $a2, 'activity_meta' ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>