Changeset 14150 for branches/14.0/src/bp-activity/bp-activity-template.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/bp-activity-template.php (modified) (1 diff)

branches/14.0/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.
-                $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;
-                    }
+                $comment_in_tree = BP_Activity_Activity::find_comment_in_tree( $comments, $comment->id );
+
+                if ( is_object( $comment_in_tree ) && isset( $comment_in_tree->depth ) ) {
+                    $depth = $comment_in_tree->depth;
                 }
             }