Changeset 11414

Timestamp:

02/06/2017 07:36:10 PM (8 years ago)

Author:

r-a-y

Message:

Activity Admin: Ensure activity comment depth check is respected.

For blog activity comment replies, we need to change the operator to
"greater or equal to" for the depth check to be accurate, due to activity
items being displayed in stream mode.

For regular activity comment replies, we need to add our activity comment
reply check to BP_Activity_List_Table::can_comment(). This can be
further optimized by moving this out of the Blogs component check in a
later release.

See #7329.

Location:

trunk/src

Files:

• bp-activity/classes/class-bp-activity-list-table.php (modified) (1 diff)
• bp-blogs/bp-blogs-activity.php (modified) (1 diff)

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

@@ -808 +808 @@
             } elseif ( 'activity_comment' === $item['type'] ) {
                 $parent_activity = new BP_Activity_Activity( $item['item_id'] );
+                $can_comment     = bp_activity_can_comment_reply( (object) $item );
             }
 

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

@@ -1301 +1301 @@
     // 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;
         }