<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3480] trunk:
Adds parameter to bp_has_activities chain to allow filters to apply only within a given set of activity ids
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3480</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-23 23:17:59 +0000 (Tue, 23 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds parameter to bp_has_activities chain to allow filters to apply only within a given set of activity ids. Fixes activity filtering on Favorites tab. Fixes #2442</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.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 (3479 => 3480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-11-23 22:59:37 UTC (rev 3479)
+++ trunk/bp-activity/bp-activity-classes.php 2010-11-23 23:17:59 UTC (rev 3480)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> // Static Functions
</span><span class="cx">
</span><del>- function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false ) {
</del><ins>+ function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> // Select conditions
</span><span class="lines">@@ -120,6 +120,13 @@
</span><span class="cx"> // Exclude specified items
</span><span class="cx"> if ( $exclude )
</span><span class="cx"> $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
</span><ins>+
+ // The specific ids to which you want to limit the query
+ if ( !empty( $in ) ) {
+ if ( is_array( $in ) )
+ $in = implode( ',', $in );
+ $where_conditions['in'] = "a.id IN ({$in})";
+ }
</ins><span class="cx">
</span><span class="cx"> // Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity
</span><span class="cx"> if ( !$display_comments || 'threaded' == $display_comments ) {
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (3479 => 3480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-11-23 22:59:37 UTC (rev 3479)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-11-23 23:17:59 UTC (rev 3480)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">
</span><span class="cx"> var $full_name;
</span><span class="cx">
</span><del>- function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude ) {
</del><ins>+ function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> $this->pag_page = isset( $_REQUEST['acpage'] ) ? intval( $_REQUEST['acpage'] ) : $page;
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> $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 ) );
</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, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude ) );
</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, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude, 'in' => $in ) );
</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">@@ -143,6 +143,7 @@
</span><span class="cx"> $user_id = false;
</span><span class="cx"> $include = false;
</span><span class="cx"> $exclude = false;
</span><ins>+ $in = false;
</ins><span class="cx"> $show_hidden = false;
</span><span class="cx"> $object = false;
</span><span class="cx"> $primary_id = false;
</span><span class="lines">@@ -169,6 +170,7 @@
</span><span class="cx"> 'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
</span><span class="cx"> 'include' => $include, // pass an activity_id or string of IDs comma-separated
</span><span class="cx"> 'exclude' => $exclude, // pass an activity_id or string of IDs comma-separated
</span><ins>+ 'in' => $in, // comma-separated list or array of activity IDs among which to search
</ins><span class="cx"> 'sort' => 'DESC', // sort DESC or ASC
</span><span class="cx"> 'page' => 1, // which page to load
</span><span class="cx"> 'per_page' => 20, // number of items per page
</span><span class="lines">@@ -231,7 +233,7 @@
</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"> break;
</span><span class="cx"> case 'mentions':
</span><span class="cx"> $user_nicename = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
</span><span class="lines">@@ -256,7 +258,7 @@
</span><span class="cx"> else if ( !empty( $user_id ) || !empty( $object ) || !empty( $action ) || !empty( $primary_id ) || !empty( $secondary_id ) )
</span><span class="cx"> $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
</span><span class="cx">
</span><del>- $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude );
</del><ins>+ $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_has_activities', $activities_template->has_activities(), $activities_template );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3479 => 3480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-11-23 22:59:37 UTC (rev 3479)
+++ trunk/bp-activity.php 2010-11-23 23:17:59 UTC (rev 3480)
</span><span class="lines">@@ -608,6 +608,7 @@
</span><span class="cx"> 'search_terms' => false, // Pass search terms as a string
</span><span class="cx"> 'show_hidden' => false, // Show activity items that are hidden site-wide?
</span><span class="cx"> 'exclude' => false, // Comma-separated list of activity IDs to exclude
</span><ins>+ 'in' => false, // Comma-separated list or array of activity IDs to which you want to limit the query
</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">@@ -632,7 +633,7 @@
</span><span class="cx"> wp_cache_set( 'bp_activity_sitewide_front', $activity, 'bp' );
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude );
</del><ins>+ $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude, $in );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_activity_get', $activity, &$r );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>