Changeset 14160

Timestamp:

12/19/2025 07:39:04 PM (8 weeks ago)

Author:

espellcaste

Message:

Return an empty array (instead of false) when BP_Activity_Activity::get_activity_comments has no comments.

Previously, the method would return a boolean false when there was no cached comments. The false had meaning before, see [13312]. But it got changed at [13312].

Props alexanderwbell.

Closes ​https://github.com/buddypress/buddypress/pull/405
Fixes #9270.

Location:

trunk/src/bp-activity

Files:

• bp-activity-template.php (modified) (1 diff)
• classes/class-bp-activity-activity.php (modified) (3 diffs)

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

@@ -2635 +2635 @@
                 $comments = BP_Activity_Activity::get_activity_comments( $comment->item_id, 1, constant( 'PHP_INT_MAX' ) );
 
-                if ( ! is_array( $comments ) ) {
-                    $comments = [];
-                }
-
                 // Recursively find our comment object from the comment tree.
                 $comment_in_tree = BP_Activity_Activity::find_comment_in_tree( $comments, $comment->id );

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

@@ -1615 +1615 @@
      * @since 1.2.0
      *
-     * @global wpdb $wpdb WordPress database object.
-     *
      * @param array  $activities Activities to fetch comments for.
      * @param string $spam       Optional. 'ham_only' (default), 'spam_only' or 'all'.
@@ -1652 +1650 @@
      * @param string $spam                Optional. 'ham_only' (default), 'spam_only' or 'all'.
      * @param int    $top_level_parent_id Optional. The id of the root-level parent activity item.
-     * @return array|false The updated activities with nested comments. False if no comments are found.
+     * @return array The updated activities with nested comments.
      */
     public static function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only', $top_level_parent_id = 0 ) {
@@ -1669 +1667 @@
         // activity item has no comments.
         if ( 'none' === $comments_cache ) {
-            return false;
+            return $comments;
 
             // A true cache miss.