<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][14150] branches/14.0: Code Modernization: address the only, so far, two issues related to PHP 8.5.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/14150">14150</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/14150","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>espellcaste</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-12-16 16:29:43 +0000 (Tue, 16 Dec 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/changeset/14147">[14147]</a>.
Props espellcaste.
Closes https://github.com/buddypress/buddypress/pull/425
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9313">#9313</a> (14.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches140srcbpactivitybpactivitytemplatephp">branches/14.0/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#branches140srcbpactivityclassesclassbpactivityactivityphp">branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
<li><a href="#branches140srcbpcorebpcoretemplateloaderphp">branches/14.0/src/bp-core/bp-core-template-loader.php</a></li>
<li><a href="#branches140testsphpunittestcasesactivityfunctionsbpActivityGetCommentDepthphp">branches/14.0/tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches140srcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/14.0/src/bp-activity/bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/14.0/src/bp-activity/bp-activity-template.php 2025-12-16 16:24:03 UTC (rev 14149)
+++ branches/14.0/src/bp-activity/bp-activity-template.php 2025-12-16 16:29:43 UTC (rev 14150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2634,20 +2634,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch the entire root comment tree... ugh.
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = BP_Activity_Activity::get_activity_comments( $comment->item_id, 1, constant( 'PHP_INT_MAX' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_array( $comments ) ) {
+ $comments = [];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Recursively find our comment object from the comment tree.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_in_tree = BP_Activity_Activity::find_comment_in_tree( $comments, $comment->id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We found the activity comment! Set the depth.
- if ( $cid === $comment->id && isset( $cobj->depth ) ) {
- $depth = $cobj->depth;
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $comment_in_tree ) && isset( $comment_in_tree->depth ) ) {
+ $depth = $comment_in_tree->depth;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches140srcbpactivityclassesclassbpactivityactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php 2025-12-16 16:24:03 UTC (rev 14149)
+++ branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php 2025-12-16 16:29:43 UTC (rev 14150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1628,7 +1628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $right Right-most node boundary.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $spam Optional. 'ham_only' (default), 'spam_only' or 'all'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $top_level_parent_id Optional. The id of the root-level parent activity item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array The updated activities with nested comments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|false The updated activities with nested comments. False if no comments are found.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only', $top_level_parent_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1743,7 +1743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $direct_parent = new BP_Activity_Activity( $parent_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $direct_parent->secondary_item_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the direct parent is not an activity update, that means we've reached
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // the parent activity item (eg. new_blog_post).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // the parent activity item (e.g. new_blog_post).
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'activity_update' !== $direct_parent->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id = $r->item_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2088,4 +2088,42 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $wpdb->get_var( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET hide_sitewide = 1 WHERE user_id = %d", $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * 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;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches140srcbpcorebpcoretemplateloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/14.0/src/bp-core/bp-core-template-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/14.0/src/bp-core/bp-core-template-loader.php 2025-12-16 16:24:03 UTC (rev 14149)
+++ branches/14.0/src/bp-core/bp-core-template-loader.php 2025-12-16 16:29:43 UTC (rev 14150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url_query_chunks = bp_parse_args( $GLOBALS['wp']->query_string, array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $directory = key( $url_query_chunks );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $bp_directories[ $directory ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $directory, $bp_directories[ $directory ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url_query_chunks[ $directory ] = $bp_directories[ $directory ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches140testsphpunittestcasesactivityfunctionsbpActivityGetCommentDepthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/14.0/tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/14.0/tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php 2025-12-16 16:24:03 UTC (rev 14149)
+++ branches/14.0/tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php 2025-12-16 16:29:43 UTC (rev 14150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,10 +40,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Instantiate activity loop, which also includes activity comments.
</span><span class="cx" style="display: block; padding: 0 10px"> bp_has_activities( 'display_comments=threaded' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Loop through activity comments generated in activity loop.
- $recursive = new RecursiveIteratorIterator( new RecursiveArrayIterator( $GLOBALS['activities_template']->activities[0]->children ), RecursiveIteratorIterator::SELF_FIRST );
- foreach ( $recursive as $aid => $a ) {
- if ( ! is_numeric( $aid ) || ! is_object( $a ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $children = $GLOBALS['activities_template']->activities[0]->children;
+
+ foreach ( array( $comment_one, $comment_one_one, $comment_two ) as $aid ) {
+ $a = BP_Activity_Activity::find_comment_in_tree( $children, $aid );
+
+ if ( false === $a ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +67,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( bp_activity_get_comment_depth(), 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up after ourselves!
</span></span></pre>
</div>
</div>
</body>
</html>