<!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][8201] trunk: Use WP's comment depth setting to limit activity comment depth</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/8201">8201</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-29 00:40:28 +0000 (Sat, 29 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use WP's comment depth setting to limit activity comment depth
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/2768">#2768</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/bp-legacy/buddypress-functions.php</a></li>
<li><a href="#trunkteststestcasesactivityclassBP_Activity_Activityphp">trunk/tests/testcases/activity/class.BP_Activity_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 (8200 => 8201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2014-03-29 00:35:30 UTC (rev 8200)
+++ trunk/bp-activity/bp-activity-classes.php 2014-03-29 00:40:28 UTC (rev 8201)
</span><span class="lines">@@ -1007,6 +1007,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Calculate depth for each item
+ foreach ( $ref as &$r ) {
+ $depth = 1;
+ $parent_id = $r->secondary_item_id;
+ while ( $parent_id !== $r->item_id ) {
+ $depth++;
+ $parent_id = $ref[ $parent_id ]->secondary_item_id;
+ }
+ $r->depth = $depth;
+ }
+
</ins><span class="cx"> // If we cache a value of false, it'll count as a cache
</span><span class="cx"> // miss the next time the activity comments are fetched.
</span><span class="cx"> // Storing the string 'none' is a hack workaround to
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (8200 => 8201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2014-03-29 00:35:30 UTC (rev 8200)
+++ trunk/bp-activity/bp-activity-template.php 2014-03-29 00:40:28 UTC (rev 8201)
</span><span class="lines">@@ -1797,8 +1797,6 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.2)
</span><span class="cx"> *
</span><del>- * @todo remove $counter global
- *
</del><span class="cx"> * @param object $comment The activity object currently being recursed
</span><span class="cx"> *
</span><span class="cx"> * @global object $activities_template {@link BP_Activity_Template}
</span><span class="lines">@@ -2151,6 +2149,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Output the depth of the current activity comment.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_activity_comment_depth() {
+ echo bp_activity_get_comment_depth();
+}
+ /**
+ * Return the current activity comment depth.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @return int
+ */
+ function bp_activity_get_comment_depth() {
+ global $activities_template;
+ return apply_filters( 'bp_activity_get_comment_depth', $activities_template->activity->current_comment->depth );
+ }
+
+/**
</ins><span class="cx"> * Output the activity comment link.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.2)
</span><span class="lines">@@ -2651,6 +2669,10 @@
</span><span class="cx"> function bp_activity_can_comment_reply( $comment ) {
</span><span class="cx"> $can_comment = true;
</span><span class="cx">
</span><ins>+ if ( get_option( 'thread_comments' ) && bp_activity_get_comment_depth() >= get_option( 'thread_comments_depth' ) ) {
+ $can_comment = false;
+ }
+
</ins><span class="cx"> return apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (8200 => 8201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2014-03-29 00:35:30 UTC (rev 8200)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2014-03-29 00:40:28 UTC (rev 8201)
</span><span class="lines">@@ -772,6 +772,17 @@
</span><span class="cx"> $activities_template->activity = new stdClass();
</span><span class="cx"> $activities_template->activity->id = $activities_template->activities[0]->item_id;
</span><span class="cx"> $activities_template->activity->current_comment = $activities_template->activities[0];
</span><ins>+
+ // Because the whole tree has not been loaded, we manually
+ // determine depth
+ $depth = 1;
+ $parent_id = $activities_template->activities[0]->secondary_item_id;
+ while ( $parent_id !== $activities_template->activities[0]->item_id ) {
+ $depth++;
+ $p_obj = new BP_Activity_Activity( $parent_id );
+ $parent_id = $p_obj->secondary_item_id;
+ }
+ $activities_template->activity->current_comment->depth = $depth;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // get activity comment template part
</span></span></pre></div>
<a id="trunkteststestcasesactivityclassBP_Activity_Activityphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/activity/class.BP_Activity_Activity.php (8200 => 8201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/activity/class.BP_Activity_Activity.php 2014-03-29 00:35:30 UTC (rev 8200)
+++ trunk/tests/testcases/activity/class.BP_Activity_Activity.php 2014-03-29 00:40:28 UTC (rev 8201)
</span><span class="lines">@@ -393,6 +393,7 @@
</span><span class="cx"> $e2->display_name = $e2_user->display_name;
</span><span class="cx"> $e2->user_fullname = bp_core_get_user_displayname( $e2->user_id );
</span><span class="cx"> $e2->children = array();
</span><ins>+ $e2->depth = 1;
</ins><span class="cx">
</span><span class="cx"> $a3_obj = new BP_Activity_Activity( $a3 );
</span><span class="cx">
</span><span class="lines">@@ -410,6 +411,7 @@
</span><span class="cx"> $e3->display_name = $e3_user->display_name;
</span><span class="cx"> $e3->user_fullname = bp_core_get_user_displayname( $e3->user_id );
</span><span class="cx"> $e3->children = array();
</span><ins>+ $e3->depth = 1;
</ins><span class="cx">
</span><span class="cx"> $expected = array(
</span><span class="cx"> $a2 => $e2,
</span></span></pre>
</div>
</div>
</body>
</html>