Ticket #7329: 7329.03.patch

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

@@ -2227 +2227 @@
  * Output the depth of the current activity comment.
  *
  * @since 2.0.0
+ * @since 2.8.0 Added $comment as a parameter.
+ *
+ * @param object|int $comment Object of the activity comment or activity comment ID. Usually unnecessary
+ *                            when used in activity comment loop.
  */
-function bp_activity_comment_depth() {
-        echo bp_activity_get_comment_depth();
+function bp_activity_comment_depth( $comment = 0 ) {
+        echo bp_activity_get_comment_depth( $comment );
 }
+
         /**
          * Return the current activity comment depth.
          *
          * @since 2.0.0
+         * @since 2.8.0 Added $comment as a parameter.
          *
-         * @return int $depth Depth for the current activity comment.
+         * @param  object|int $comment Object of the activity comment or activity comment ID. Usually unnecessary
+         *                             when used in activity comment loop.
+         * @return int
          */
-        function bp_activity_get_comment_depth() {
-                global $activities_template;
+        function bp_activity_get_comment_depth( $comment = 0 ) {
+                $depth = 0;
+
+                // Activity comment loop takes precedence.
+                if ( isset( $GLOBALS['activities_template']->activity->current_comment->depth ) ) {
+                        $depth = $GLOBALS['activities_template']->activity->current_comment->depth;
+
+                // Get depth for activity comment manually.
+                } elseif ( ! empty( $comment ) ) {
+                        // We passed an activity ID, so fetch the activity object.
+                        if ( is_int( $comment ) ) {
+                                $comment = new BP_Activity_Activity( $comment );
+                        }
+
+                        // Recurse through activity tree to find the depth.
+                        if ( is_object( $comment ) && isset( $comment->type ) && 'activity_comment' === $comment->type ) {
+                                // Fetch the entire root comment tree... ugh.
+                                $comments = BP_Activity_Activity::get_activity_comments( $comment->item_id, 1, constant( 'PHP_INT_MAX' ) );
+
+                                // Recursively find our comment object from the comment tree.
+                                $iterator  = new RecursiveArrayIterator( $comments );
+                                $recursive = new RecursiveIteratorIterator( $iterator, RecursiveIteratorIterator::SELF_FIRST );
+                                foreach ( $recursive as $cid => $cobj ) {
+                                        // Skip items that are not a comment object.
+                                        if ( ! is_numeric( $cid ) || ! is_object( $cobj ) ) {
+                                                continue;
+                                        }
+
+                                        // We found the activity comment! Set the depth.
+                                        if ( $cid === $comment->id && isset( $cobj->depth ) ) {
+                                                $depth = $cobj->depth;
+                                                break;
+                                        }
+                                }
+                        }
+                }
 
                 /**
                  * Filters the comment depth of the current activity comment.
@@ -2248 +2290 @@
                  *
                  * @param int $depth Depth for the current activity comment.
                  */
-                return apply_filters( 'bp_activity_get_comment_depth', $activities_template->activity->current_comment->depth );
+                return apply_filters( 'bp_activity_get_comment_depth', $depth );
         }
 
 /**
@@ -2884 +2926 @@
                 // Fall back on current comment in activity loop.
                 $comment_depth = isset( $comment->depth )
                         ? intval( $comment->depth )
-                        : bp_activity_get_comment_depth();
+                        : bp_activity_get_comment_depth( $comment );
 
                 // Threading is turned on, so check the depth.
                 if ( get_option( 'thread_comments' ) ) {

src/bp-activity/classes/class-bp-activity-list-table.php

@@ -807 +807 @@
                                 $parent_activity = (object) $item;
                         } elseif ( 'activity_comment' === $item['type'] ) {
                                 $parent_activity = new BP_Activity_Activity( $item['item_id'] );
+                                $can_comment     = bp_activity_can_comment_reply( (object) $item );
                         }
 
                         if ( isset( $parent_activity->type ) && bp_activity_post_type_get_tracking_arg( $parent_activity->type, 'post_type' ) ) {

src/bp-blogs/bp-blogs-activity.php

@@ -1147 +1147 @@
         }
 
         $allow_comments = bp_blogs_comments_open( $activity );
-        $thread_depth   = bp_blogs_get_blogmeta( $activity->item_id, 'thread_comments_depth' );
+        $thread_depth   = (int) bp_blogs_get_blogmeta( $activity->item_id, 'thread_comments_depth' );
 
         // Initialize a local object so we won't have to query this again in the
         // comment loop.
@@ -1300 +1300 @@
 
         // Check comment depth and disable if depth is too large.
         if ( isset( buddypress()->blogs->thread_depth[$comment->item_id] ) ){
-                if ( bp_activity_get_comment_depth() > buddypress()->blogs->thread_depth[$comment->item_id] ) {
+                if ( bp_activity_get_comment_depth( $comment ) >= buddypress()->blogs->thread_depth[ $comment->item_id ] ) {
                         $retval = false;
                 }
         }

new file tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php

@@ +1 @@
+<?php
+
+/**
+ * @group activity
+ * @group bp_activity_get_comment_depth
+ */
+class BP_Tests_Activity_Functions_BpActivityGetCommentDepth extends BP_UnitTestCase {
+        /**
+         * @ticket BP7329
+         */
+        public function test_depth_inside_activity_comment_loop() {
+                $u = $this->factory->user->create();
+
+                // create an activity update
+                $parent_activity = $this->factory->activity->create( array(
+                        'type'    => 'activity_update',
+                        'user_id' => $u
+                ) );
+
+                // create some activity comments
+                $comment_one = bp_activity_new_comment( array(
+                        'user_id'     => $u,
+                        'activity_id' => $parent_activity,
+                        'content'     => 'depth 1'
+                ) );
+
+                $comment_one_one = bp_activity_new_comment( array(
+                        'user_id'     => $u,
+                        'activity_id' => $parent_activity,
+                        'parent_id'   => $comment_one,
+                        'content'     => 'depth 2'
+                ) );
+
+                $comment_two = bp_activity_new_comment( array(
+                        'user_id'     => $u,
+                        'activity_id' => $parent_activity,
+                        'content'     => 'depth 1'
+                ) );
+
+                // Instantiate activity loop, which also includes activity comments.
+                bp_has_activities( 'display_comments=threaded' );
+
+                // Loop through activity comments generated in activity loop.
+                $recursive = new RecursiveIteratorIterator( new RecursiveArrayIterator( $GLOBALS['activities_template']->activities[0]->children ), RecursiveIteratorIterator::SELF_FIRST );
+                foreach ( $recursive as $aid => $a ) {
+                        if ( ! is_numeric( $aid ) || ! is_object( $a ) ) {
+                                continue;
+                        }
+
+                        /*
+                         * Emulate activity comment loop global, which bp_activity_get_comment_depth()
+                         * relies on by default.
+                         */
+                        $GLOBALS['activities_template']->activity = new stdClass;
+                        $GLOBALS['activities_template']->activity->current_comment = $a;
+
+                        // $aid is the activity ID for the current activity comment.
+                        switch ( $aid ) {
+                                case $comment_one :
+                                case $comment_two :
+                                        $this->assertSame( bp_activity_get_comment_depth(), 1 );
+                                        break;
+
+                                case $comment_one_one :
+                                        $this->assertSame( bp_activity_get_comment_depth(), 2 );
+                                        break;
+                        }
+                        
+                }
+
+                // Clean up after ourselves!
+                $GLOBALS['activities_template'] = null;
+        }
+
+        /**
+         * @ticket BP7329
+         */
+        public function test_depth_outside_of_activity_comment_loop() {
+                $u = $this->factory->user->create();
+
+                // create an activity update
+                $parent_activity = $this->factory->activity->create( array(
+                        'type'    => 'activity_update',
+                        'user_id' => $u
+                ) );
+
+                // create some activity comments
+                $comment_one = bp_activity_new_comment( array(
+                        'user_id'     => $u,
+                        'activity_id' => $parent_activity,
+                        'content'     => 'depth 1'
+                ) );
+
+                $comment_one_one = bp_activity_new_comment( array(
+                        'user_id'     => $u,
+                        'activity_id' => $parent_activity,
+                        'parent_id'   => $comment_one,
+                        'content'     => 'depth 2'
+                ) );
+
+                $comment_two = bp_activity_new_comment( array(
+                        'user_id'     => $u,
+                        'activity_id' => $parent_activity,
+                        'content'     => 'depth 1'
+                ) );
+
+                $this->assertSame( bp_activity_get_comment_depth( $comment_one ), 1 );
+                $this->assertSame( bp_activity_get_comment_depth( $comment_one_one ), 2 );
+                $this->assertSame( bp_activity_get_comment_depth( $comment_two ), 1 );
+        }
+}