<!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][6926] trunk: In bp_has_activities(), allow 'favorites' to be filtered by 'Show' dropdown</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/6926">6926</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-04-19 20:37:02 +0000 (Fri, 19 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>In bp_has_activities(), allow 'favorites' to be filtered by 'Show' dropdown
Switching the 'favorites' logic to interpret the favorite ids as part of the
'in' parameter rather than the 'include' paramater allows other filter params,
including those in the 'Show' dropdown on activity directories (the 'action'
parameter of bp_has_activities()) to work.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4872">#4872</a>
Props chroniko</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (6925 => 6926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2013-04-19 20:36:56 UTC (rev 6925)
+++ trunk/bp-activity/bp-activity-template.php 2013-04-19 20:37:02 UTC (rev 6926)
</span><span class="lines">@@ -410,8 +410,9 @@
</span><span class="cx"> if ( empty( $favs ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $include = implode( ',', (array) $favs );
</del><ins>+ $in = implode( ',', (array) $favs );
</ins><span class="cx"> $display_comments = true;
</span><ins>+ $user_id = 0;
</ins><span class="cx"> break;
</span><span class="cx"> case 'mentions':
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasesactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/activity/template.php (6925 => 6926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/activity/template.php 2013-04-19 20:36:56 UTC (rev 6925)
+++ trunk/tests/testcases/activity/template.php 2013-04-19 20:37:02 UTC (rev 6926)
</span><span class="lines">@@ -56,4 +56,58 @@
</span><span class="cx"> $this->set_current_user( $original_user );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+ /**
+ * Make sure that action filters ('activity_update', etc) work when
+ * limiting query to user favorites
+ *
+ * @ticket BP4872
+ */
+ public function test_bp_has_activities_favorites_action_filter() {
+ $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+
+ $a1 = $this->factory->activity->create( array(
+ 'type' => 'activity_update',
+ ) );
+
+ $a2 = $this->factory->activity->create( array(
+ 'type' => 'joined_group',
+ ) );
+
+ bp_activity_add_user_favorite( $a1->id, $user_id );
+ bp_activity_add_user_favorite( $a2->id, $user_id );
+
+ // groan. It sucks that you have to invoke the global
+ global $activities_template;
+
+ // Case 1: no action filter
+ bp_has_activities( array(
+ 'user_id' => $user_id,
+ 'scope' => 'favorites',
+ ) );
+
+ // The formatting of $activities_template->activities is messed
+ // up, so we're just going to look at the IDs. This should be
+ // fixed in BP at some point
+ $ids = wp_list_pluck( $activities_template->activities, 'id' );
+
+ $this->assertEquals( $ids, array( $a1->id, $a2->id ) );
+
+ $activities_template = null;
+
+ // Case 2: action filter
+ bp_has_activities( array(
+ 'user_id' => $user_id,
+ 'scope' => 'favorites',
+ 'action' => 'activity_update',
+ ) );
+
+ global $wpdb, $bp;
+
+ $ids = wp_list_pluck( $activities_template->activities, 'id' );
+
+ $this->assertEquals( $ids, array( $a1->id ) );
+
+ $activities_template = null;
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>