Changeset 8402

Timestamp:

05/09/2014 07:16:31 PM (12 years ago)

Author:

boonebgorges

Message:

Disable activity reply threading if WP comment threading is disabled

In r8201, BP adopted WP's thread_comments_depth setting for its own activity
reply threading. See #2768. 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 #5562

Location:

trunk

Files:

• src/bp-activity/bp-activity-template.php (modified) (1 diff)
• src/bp-languages/buddypress.pot (modified) (2 diffs)
• tests/phpunit/testcases/activity/template.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-template.php

@@ -2657 +2657 @@
 
 /**
- * Determine if a comment can be made on an activity reply item.
- *
- * Defaults to true, but can be modified by plugins.
- *
- * @since BuddyPress (1.5)
- *
- * @uses apply_filters() To call the 'bp_activity_can_comment_reply' hook
+ * Determine whether a comment can be made on an activity reply item.
+ *
+ * @since BuddyPress (1.5.0)
  *
  * @param object $comment Activity comment.
- * @return bool $can_comment True if comment can receive comments.
+ * @return bool $can_comment True if comment can receive comments, otherwise
+ *         false.
  */
 function bp_activity_can_comment_reply( $comment ) {
         $can_comment = true;
 
-        if ( get_option( 'thread_comments' ) && bp_activity_get_comment_depth() >= get_option( 'thread_comments_depth' ) ) {
+        // 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
                 $can_comment = false;
         }

trunk/src/bp-languages/buddypress.pot

@@ -5 +5 @@
 "Project-Id-Version: BuddyPress 2.1-alpha\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/buddypress\n"
-"POT-Creation-Date: 2014-05-08 17:46:26+00:00\n"
+"POT-Creation-Date: 2014-05-09 19:15:25+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -869 +869 @@
 msgstr ""
 
-#: bp-activity/bp-activity-template.php:2852
+#: bp-activity/bp-activity-template.php:2860
 msgid "a user"
 msgstr ""
 
-#: bp-activity/bp-activity-template.php:2906
+#: bp-activity/bp-activity-template.php:2914
 msgid "Send a public message on your activity stream."
 msgstr ""
 
-#: bp-activity/bp-activity-template.php:2907
+#: bp-activity/bp-activity-template.php:2915
 msgid "Public Message"
 msgstr ""
 
-#: bp-activity/bp-activity-template.php:3360
+#: bp-activity/bp-activity-template.php:3368
 msgid "Site Wide Activity RSS Feed"
 msgstr ""

trunk/tests/phpunit/testcases/activity/template.php

@@ -308 +308 @@
                 $this->assertNotEmpty( wp_cache_get( $a2, 'activity_meta' ) );
         }
+
+        /**
+         * @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;
+        }
 }