<!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] [2093] trunk/bp-activity/bp-activity-classes.php:
Making sure in-stream activity comments show,
even if the stream is filtered.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2093</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-11-13 19:42:53 +0000 (Fri, 13 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Making sure in-stream activity comments show, even if the stream is filtered.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.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 (2092 => 2093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2009-11-13 17:39:04 UTC (rev 2092)
+++ trunk/bp-activity/bp-activity-classes.php 2009-11-13 19:42:53 UTC (rev 2093)
</span><span class="lines">@@ -93,12 +93,6 @@
</span><span class="cx"> if ( $user_id )
</span><span class="cx"> $user_sql = $wpdb->prepare( "AND user_id = %d", $user_id );
</span><span class="cx">
</span><del>- /* Fetch the activity IDs so we can delete any comments for this activity item */
- $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
-
- if ( $activity_ids )
- BP_Activity_Activity::delete_activity_item_comments( $activity_ids );
-
</del><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -109,59 +103,27 @@
</span><span class="cx"> function delete_by_activity_id( $activity_id ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- /* Delete the comments for this activity ID */
- BP_Activity_Activity::delete_activity_item_comments( $activity_id );
-
</del><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE id = %d", $activity_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function delete_by_content( $user_id, $content, $component_name, $component_action ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- /* Fetch the activity ID so we can delete any comments for this activity item */
- $activity_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $user_id, $content, $component_name, $component_action ) );
-
- if ( $activity_id )
- BP_Activity_Activity::delete_activity_item_comments( $activity_id );
-
</del><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $user_id, $content, $component_name, $component_action ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function delete_for_user_by_component( $user_id, $component_name ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- /* Fetch the activity IDs so we can delete any comments for this activity item */
- $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND component_name = %s", $user_id, $component_name ) );
-
- if ( $activity_ids )
- BP_Activity_Activity::delete_activity_item_comments( $activity_ids );
-
</del><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND component_name = %s", $user_id, $component_name ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function delete_for_user( $user_id ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- /* Fetch the activity IDs so we can delete any comments for this activity item */
- $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d", $user_id ) );
-
- if ( $activity_ids )
- BP_Activity_Activity::delete_activity_item_comments( $activity_ids );
-
</del><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d", $user_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete_activity_item_comments( $activity_ids ) {
- global $bp, $wpdb;
-
- if ( is_array($activity_ids) )
- $activity_ids = implode( ',', $activity_ids );
-
- $activity_ids = $wpdb->escape( $activity_ids );
-
- return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE component_action = 'activity_comment' AND item_id IN ({$activity_ids})" ) );
- }
-
</del><span class="cx"> function get_activity_for_user( $user_id, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="lines">@@ -281,13 +243,44 @@
</span><span class="cx"> if ( $activities && $display_comments )
</span><span class="cx"> $activities = BP_Activity_Activity::append_comments( &$activities );
</span><span class="cx"> } else {
</span><del>- if ( $per_page && $page && $max )
- $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$pag_sql}" ) );
- else
- $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}" ) );
</del><ins>+ /***
+ * If we are filtering, this is going to stop activity comments showing in the stream,
+ * we will need to do things slightly differently.
+ */
+ if ( !empty( $filter_sql ) ) {
+ $all_activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY id {$sort}" ) );
</ins><span class="cx">
</span><del>- $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
</del><ins>+ foreach ( (array)$all_activities as $activity ) {
+ $tmp_activities[$activity->id] = $activity;
+ $a_ids[] = $activity->id;
+ }
+ $activity_ids = $wpdb->escape( implode( ',', $a_ids ) );
</ins><span class="cx">
</span><ins>+ /* Fetch the comments for the activity items */
+ $all_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 AND item_id IN ({$activity_ids}) {$search_sql} ORDER BY id {$sort}" ) );
+
+ foreach ( (array)$all_comments as $comment ) {
+ $tmp_comments[$comment->id] = $comment;
+ }
+
+ /* Merge, sort and splice the activities and comments */
+ $activities = $tmp_comments + $tmp_activities;
+ ksort( $activities );
+ $activities = array_reverse( array_merge( array(), (array)$activities ) );
+ $activities = array_slice( (array)$activities, intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
+
+ /* Fetch the totals */
+ $total_activities = count($all_activities) + count($all_comments);
+ } else {
+ if ( $per_page && $page && $max )
+ $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY id {$sort} {$pag_sql}" ) );
+ else
+ $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY id {$sort} {$pag_sql} {$max_sql}" ) );
+
+ $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
+ }
+
+ /* Append threaded comments to those activites that have them */
</ins><span class="cx"> if ( $activities )
</span><span class="cx"> $activities = BP_Activity_Activity::append_comments( &$activities );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>