<!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][4111] branches/1.2: Fix favourited activity items from hidden groups showing in members' profiles.</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, #logmsg > ol { margin-left: 0; 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>4111</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-03-11 20:04:13 +0000 (Fri, 11 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix favourited activity items from hidden groups showing in members' profiles. Fixes #2678 (branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivitybpactivityclassesphp">branches/1.2/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#branches12bpactivitybpactivitytemplatetagsphp">branches/1.2/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity/bp-activity-classes.php (4110 => 4111)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity/bp-activity-classes.php 2011-03-11 19:48:15 UTC (rev 4110)
+++ branches/1.2/bp-activity/bp-activity-classes.php 2011-03-11 20:04:13 UTC (rev 4111)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> return array( 'activities' => $activities, 'total' => (int)$total_activities );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_specific( $activity_ids, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $display_comments = false ) {
</del><ins>+ function get_specific( $activity_ids, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $display_comments = false, $show_hidden = false ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> if ( is_array( $activity_ids ) )
</span><span class="lines">@@ -183,9 +183,15 @@
</span><span class="cx"> if ( $sort != 'ASC' && $sort != 'DESC' )
</span><span class="cx"> $sort = 'DESC';
</span><span class="cx">
</span><del>- $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql" ) );
- $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids})" ) );
</del><ins>+ // Hide Hidden Items?
+ if ( !$show_hidden )
+ $hidden_sql = "AND hide_sitewide = 0";
+ else
+ $hidden_sql = '';
</ins><span class="cx">
</span><ins>+ $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) {$hidden_sql} ORDER BY date_recorded {$sort} {$pag_sql}" ) );
+ $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) {$hidden_sql}" ) );
+
</ins><span class="cx"> if ( $display_comments )
</span><span class="cx"> $activities = BP_Activity_Activity::append_comments( $activities );
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity/bp-activity-templatetags.php (4110 => 4111)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity/bp-activity-templatetags.php 2011-03-11 19:48:15 UTC (rev 4110)
+++ branches/1.2/bp-activity/bp-activity-templatetags.php 2011-03-11 20:04:13 UTC (rev 4111)
</span><span class="lines">@@ -29,7 +29,7 @@
</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 ) );
</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 ) );
</ins><span class="cx"> // Fetch all activity items
</span><span class="cx"> else
</span><span class="cx"> $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 ) );
</span></span></pre></div>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (4110 => 4111)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2011-03-11 19:48:15 UTC (rev 4110)
+++ branches/1.2/bp-activity.php 2011-03-11 20:04:13 UTC (rev 4111)
</span><span class="lines">@@ -610,18 +610,19 @@
</span><span class="cx">
</span><span class="cx"> function bp_activity_get_specific( $args = '' ) {
</span><span class="cx"> $defaults = array(
</span><del>- 'activity_ids' => false, // A single activity_id or array of IDs.
- 'page' => 1, // page 1 without a per_page will result in no pagination.
- 'per_page' => false, // results per page
- 'max' => false, // Maximum number of results to return
- 'sort' => 'DESC', // sort ASC or DESC
- 'display_comments' => false // true or false to display threaded comments for these specific activity items
</del><ins>+ 'activity_ids' => false, // A single activity_id or array of IDs.
+ 'page' => 1, // page 1 without a per_page will result in no pagination.
+ 'per_page' => false, // results per page
+ 'max' => false, // Maximum number of results to return
+ 'sort' => 'DESC', // sort ASC or DESC
+ 'display_comments' => false, // true or false to display threaded comments for these specific activity items
+ 'show_hidden' => false
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get_specific( $activity_ids, $max, $page, $per_page, $sort, $display_comments ) );
</del><ins>+ return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get_specific( $activity_ids, $max, $page, $per_page, $sort, $display_comments, $show_hidden ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_add( $args = '' ) {
</span><span class="lines">@@ -994,7 +995,7 @@
</span><span class="cx">
</span><span class="cx"> function bp_activity_get_user_favorites( $user_id ) {
</span><span class="cx"> $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
</span><del>- $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) );
</del><ins>+ $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs, 'show_hidden' => true ) );
</ins><span class="cx">
</span><span class="cx"> foreach( (array)$existing_favs['activities'] as $fav )
</span><span class="cx"> $new_favs[] = $fav->id;
</span></span></pre>
</div>
</div>
</body>
</html>