<!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][8402] trunk: Disable activity reply threading if WP comment threading is disabled</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/8402">8402</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-05-09 19:16:31 +0000 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable activity reply threading if WP comment threading is disabled
In <a href="http://buddypress.trac.wordpress.org/changeset/8201">r8201</a>, BP adopted WP's thread_comments_depth setting for its own activity
reply threading. See <a href="http://buddypress.trac.wordpress.org/ticket/2768">#2768</a>. However, the thread_comments toggle was not
respected. The current changeset adds support for thread_comments, so that
disabling WP comment threading will also enable nested activity comments
(though the top level of comments will still be allowed).
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5562">#5562</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunksrcbplanguagesbuddypresspot">trunk/src/bp-languages/buddypress.pot</a></li>
<li><a href="#trunktestsphpunittestcasesactivitytemplatephp">trunk/tests/phpunit/testcases/activity/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-template.php (8401 => 8402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-template.php 2014-05-08 17:47:36 UTC (rev 8401)
+++ trunk/src/bp-activity/bp-activity-template.php 2014-05-09 19:16:31 UTC (rev 8402)
</span><span class="lines">@@ -2656,21 +2656,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Determine if a comment can be made on an activity reply item.
</del><ins>+ * Determine whether a comment can be made on an activity reply item.
</ins><span class="cx"> *
</span><del>- * Defaults to true, but can be modified by plugins.
</del><ins>+ * @since BuddyPress (1.5.0)
</ins><span class="cx"> *
</span><del>- * @since BuddyPress (1.5)
- *
- * @uses apply_filters() To call the 'bp_activity_can_comment_reply' hook
- *
</del><span class="cx"> * @param object $comment Activity comment.
</span><del>- * @return bool $can_comment True if comment can receive comments.
</del><ins>+ * @return bool $can_comment True if comment can receive comments, otherwise
+ * false.
</ins><span class="cx"> */
</span><span class="cx"> function bp_activity_can_comment_reply( $comment ) {
</span><span class="cx"> $can_comment = true;
</span><span class="cx">
</span><del>- if ( get_option( 'thread_comments' ) && bp_activity_get_comment_depth() >= get_option( 'thread_comments_depth' ) ) {
</del><ins>+ // Fall back on current comment in activity loop
+ $comment_depth = 0;
+ if ( isset( $comment->depth ) ) {
+ $comment_depth = intval( $comment->depth );
+ } else {
+ $comment_depth = bp_activity_get_comment_depth();
+ }
+
+ if ( get_option( 'thread_comments' ) ) {
+ $can_comment = $comment_depth < get_option( 'thread_comments_depth' );
+ } else {
+ // No threading for comment replies if no threading for comments
</ins><span class="cx"> $can_comment = false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbplanguagesbuddypresspot"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-languages/buddypress.pot (8401 => 8402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-languages/buddypress.pot 2014-05-08 17:47:36 UTC (rev 8401)
+++ trunk/src/bp-languages/buddypress.pot 2014-05-09 19:16:31 UTC (rev 8402)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> msgstr ""
</span><span class="cx"> "Project-Id-Version: BuddyPress 2.1-alpha\n"
</span><span class="cx"> "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/buddypress\n"
</span><del>-"POT-Creation-Date: 2014-05-08 17:46:26+00:00\n"
</del><ins>+"POT-Creation-Date: 2014-05-09 19:15:25+00:00\n"
</ins><span class="cx"> "MIME-Version: 1.0\n"
</span><span class="cx"> "Content-Type: text/plain; charset=utf-8\n"
</span><span class="cx"> "Content-Transfer-Encoding: 8bit\n"
</span><span class="lines">@@ -868,19 +868,19 @@
</span><span class="cx"> msgid "Clear Filter"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: bp-activity/bp-activity-template.php:2852
</del><ins>+#: bp-activity/bp-activity-template.php:2860
</ins><span class="cx"> msgid "a user"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: bp-activity/bp-activity-template.php:2906
</del><ins>+#: bp-activity/bp-activity-template.php:2914
</ins><span class="cx"> msgid "Send a public message on your activity stream."
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: bp-activity/bp-activity-template.php:2907
</del><ins>+#: bp-activity/bp-activity-template.php:2915
</ins><span class="cx"> msgid "Public Message"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: bp-activity/bp-activity-template.php:3360
</del><ins>+#: bp-activity/bp-activity-template.php:3368
</ins><span class="cx"> msgid "Site Wide Activity RSS Feed"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/testcases/activity/template.php (8401 => 8402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/testcases/activity/template.php 2014-05-08 17:47:36 UTC (rev 8401)
+++ trunk/tests/phpunit/testcases/activity/template.php 2014-05-09 19:16:31 UTC (rev 8402)
</span><span class="lines">@@ -307,4 +307,72 @@
</span><span class="cx"> $this->assertNotEmpty( wp_cache_get( $a1, 'activity_meta' ) );
</span><span class="cx"> $this->assertNotEmpty( wp_cache_get( $a2, 'activity_meta' ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group bp_activity_can_comment_reply
+ */
+ public function test_bp_activity_can_comment_reply_thread_comments_on() {
+ $tc = get_option( 'thread_comments' );
+ update_option( 'thread_comments', '1' );
+
+ $tcd = get_option( 'thread_comments_depth' );
+ update_option( 'thread_comments_depth', '4' );
+
+ // Fake the global
+ global $activities_template;
+ $activities_template = new stdClass;
+ $activities_template->activity = new stdClass;
+ $activities_template->activity->current_comment = new stdClass;
+
+ $comment = new stdClass;
+ $comment->item_id = 4;
+
+ $activities_template->activity->current_comment->depth = 1;
+ $this->assertTrue( bp_activity_can_comment_reply( $comment ) );
+
+ $activities_template->activity->current_comment->depth = 3;
+ $this->assertTrue( bp_activity_can_comment_reply( $comment ) );
+
+ $activities_template->activity->current_comment->depth = 4;
+ $this->assertFalse( bp_activity_can_comment_reply( $comment ) );
+
+ $activities_template->activity->current_comment->depth = 5;
+ $this->assertFalse( bp_activity_can_comment_reply( $comment ) );
+
+ // Set right what once went wrong
+ update_option( 'thread_comments', $tc );
+ update_option( 'thread_comments_depth', $tcd );
+ $activities_template = null;
+ }
+
+ /**
+ * @group bp_activity_can_comment_reply
+ */
+ public function test_bp_activity_can_comment_reply_thread_comments_off() {
+ $tc = get_option( 'thread_comments' );
+ update_option( 'thread_comments', '0' );
+
+ $tcd = get_option( 'thread_comments_depth' );
+ update_option( 'thread_comments_depth', '4' );
+
+ // Fake the global
+ global $activities_template;
+ $activities_template = new stdClass;
+ $activities_template->activity = new stdClass;
+ $activities_template->activity->current_comment = new stdClass;
+
+ $comment = new stdClass;
+ $comment->item_id = 4;
+
+ $activities_template->activity->current_comment->depth = 1;
+ $this->assertFalse( bp_activity_can_comment_reply( $comment ) );
+
+ $activities_template->activity->current_comment->depth = 2;
+ $this->assertFalse( bp_activity_can_comment_reply( $comment ) );
+
+ // Set right what once went wrong
+ update_option( 'thread_comments', $tc );
+ update_option( 'thread_comments_depth', $tcd );
+ $activities_template = null;
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>