Changeset 14150 for branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php

Timestamp:

12/16/2025 04:29:43 PM (5 months ago)

Author:

espellcaste

Message:

Code Modernization: address the only, so far, two issues related to PHP 8.5.

• Instances of using null as an array offset.
• ArrayIterator::__construct(): Using an object as a backing array for ArrayIterator is deprecated.

Reference: ​https://wiki.php.net/rfc/deprecations_php_8_5\#deprecate_arrayobject_and_arrayiterator_with_objects

Follow-up to [14147].

Props espellcaste.

Closes ​https://github.com/buddypress/buddypress/pull/425
Fixes #9313 (14.0)

File:

• branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php (modified) (3 diffs)

branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php

@@ -1629 +1629 @@
      * @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 The updated activities with nested comments.
+     * @return array|false The updated activities with nested comments. False if no comments are found.
      */
     public static function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only', $top_level_parent_id = 0 ) {
@@ -1744 +1744 @@
                         if ( isset( $direct_parent->secondary_item_id ) ) {
                             // If the direct parent is not an activity update, that means we've reached
-                            // the parent activity item (eg. new_blog_post).
+                            // the parent activity item (e.g. new_blog_post).
                             if ( 'activity_update' !== $direct_parent->type ) {
                                 $parent_id = $r->item_id;
@@ -2089 +2089 @@
         return $wpdb->get_var( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET hide_sitewide = 1 WHERE user_id = %d", $user_id ) );
     }
+
+    /**
+     * Recursively find a comment object from a nested comment tree.
+     *
+     * @since 14.5.0
+     *
+     * @param array $comments  Array of comment objects with nested children.
+     * @param int   $target_id The comment ID to find.
+     * @return object|false The comment object if found, false otherwise.
+     */
+    public static function find_comment_in_tree( $comments, $target_id ) {
+
+        if ( ! is_array( $comments ) ) {
+            return false;
+        }
+
+        foreach ( $comments as $comment_id => $comment ) {
+            // Skip items that are not a comment object.
+            if ( ! is_numeric( $comment_id ) || ! is_object( $comment ) ) {
+                continue;
+            }
+
+            if ( (int) $comment_id === (int) $target_id ) {
+                return $comment;
+            }
+
+            // Recurse into children if they exist.
+            if ( ! empty( $comment->children ) && is_array( $comment->children ) ) {
+                $found = self::find_comment_in_tree( $comment->children, $target_id );
+
+                if ( false !== $found ) {
+                    return $found;
+                }
+            }
+        }
+
+        return false;
+    }
 }