Changeset 8201

Timestamp:

03/29/2014 12:40:28 AM (11 years ago)

Author:

boonebgorges

Message:

Use WP's comment depth setting to limit activity comment depth

Fixes #2768

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-activity/bp-activity-template.php (modified) (3 diffs)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
• tests/testcases/activity/class.BP_Activity_Activity.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -1008 +1008 @@
             }
 
+            // 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;
+            }
+
             // If we cache a value of false, it'll count as a cache
             // miss the next time the activity comments are fetched.

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

@@ -1798 +1798 @@
          * @since BuddyPress (1.2)
          *
-         * @todo remove $counter global
-         *
          * @param object $comment The activity object currently being recursed
          *
@@ -2152 +2150 @@
 
 /**
+ * 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 );
+    }
+
+/**
  * Output the activity comment link.
  *
@@ -2652 +2670 @@
     $can_comment = true;
 
+    if ( get_option( 'thread_comments' ) && bp_activity_get_comment_depth() >= get_option( 'thread_comments_depth' ) ) {
+        $can_comment = false;
+    }
+
     return apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
 }

trunk/bp-templates/bp-legacy/buddypress-functions.php

@@ -773 +773 @@
         $activities_template->activity->id              = $activities_template->activities[0]->item_id;
         $activities_template->activity->current_comment = $activities_template->activities[0];
+
+        // 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;
     }
 

trunk/tests/testcases/activity/class.BP_Activity_Activity.php

@@ -394 +394 @@
         $e2->user_fullname = bp_core_get_user_displayname( $e2->user_id );
         $e2->children = array();
+        $e2->depth = 1;
 
         $a3_obj = new BP_Activity_Activity( $a3 );
@@ -411 +412 @@
         $e3->user_fullname = bp_core_get_user_displayname( $e3->user_id );
         $e3->children = array();
+        $e3->depth = 1;
 
         $expected = array(