<!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][6410] trunk/bp-activity/bp-activity-classes.php: Ensure that BP_Activity_Activity::get() pulls up comments for non-top-level items</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><a href="http://buddypress.trac.wordpress.org/changeset/6410">6410</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-10-15 19:09:43 +0000 (Mon, 15 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that BP_Activity_Activity::get() pulls up comments for non-top-level items
There was previously an exception in BP_Activity_Activity::append_comments()
that would make it impossible to load activity comments for activity items
that were themselves activity comments. This changeset removes the restriction,
and adds the necessary top_level_parent_id parameter to the get_comments()
method so that the comment tree is pulled up correctly in all cases.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4600">#4600</a>
Props sboisvert</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 (6409 => 6410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2012-10-15 17:36:31 UTC (rev 6409)
+++ trunk/bp-activity/bp-activity-classes.php 2012-10-15 19:09:43 UTC (rev 6410)
</span><span class="lines">@@ -452,13 +452,13 @@
</span><span class="cx">
</span><span class="cx"> $activity_comments = array();
</span><span class="cx">
</span><del>- /* Now fetch the activity comments and parse them into the correct position in the activities array. */
</del><ins>+ // Now fetch the activity comments and parse them into the correct position in the activities array.
</ins><span class="cx"> foreach( (array) $activities as $activity ) {
</span><del>- if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right )
- $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $spam );
</del><ins>+ $top_level_parent_id = 'activity_comment' == $activity->type ? $activity->item_id : 0;
+ $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $spam );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- /* Merge the comments with the activity items */
</del><ins>+ // Merge the comments with the activity items
</ins><span class="cx"> foreach( (array) $activities as $key => $activity )
</span><span class="cx"> if ( isset( $activity_comments[$activity->id] ) )
</span><span class="cx"> $activities[$key]->children = $activity_comments[$activity->id];
</span><span class="lines">@@ -475,12 +475,17 @@
</span><span class="cx"> * @param int $left Left-most node boundary
</span><span class="cx"> * @param into $right Right-most node boundary
</span><span class="cx"> * @param bool $spam Optional; 'ham_only' (default), 'spam_only' or 'all'.
</span><ins>+ * @param int $top_level_parent_id The id of the root-level parent activity item
</ins><span class="cx"> * @return array The updated activities with nested comments
</span><span class="cx"> * @since BuddyPress (1.2)
</span><span class="cx"> */
</span><del>- function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only' ) {
</del><ins>+ function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only', $top_level_parent_id = 0 ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><ins>+ if ( empty( $top_level_parent_id ) ) {
+ $top_level_parent_id = $activity_id;
+ }
+
</ins><span class="cx"> if ( !$comments = wp_cache_get( 'bp_activity_comments_' . $activity_id ) ) {
</span><span class="cx"> // Select the user's fullname with the query
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span><span class="lines">@@ -501,7 +506,8 @@
</span><span class="cx"> else
</span><span class="cx"> $spam_sql = '';
</span><span class="cx">
</span><del>- $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right, $spam_sql );
</del><ins>+ // The mptt BETWEEN clause allows us to limit returned descendants to the right part of the tree
+ $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $top_level_parent_id, $left, $right ), $activity_id, $left, $right, $spam_sql );
</ins><span class="cx">
</span><span class="cx"> // Retrieve all descendants of the $root node
</span><span class="cx"> $descendants = $wpdb->get_results( $sql );
</span></span></pre>
</div>
</div>
</body>
</html>