<!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][9961] trunk/src/bp-activity/classes/class-bp-activity-activity.php: Activity: When calculating the activity comment depth, prevent an infinite loop when the parent activity item is not an activity update.</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 { 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/9961">9961</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/9961","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-22 19:17:05 +0000 (Mon, 22 Jun 2015)</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'>Activity: When calculating the activity comment depth, prevent an infinite loop when the parent activity item is not an activity update.
In <a href="http://buddypress.trac.wordpress.org/ticket/2768">#2768</a>, we added the ability to calculate the activity comment depth.
The code at the time was meant to calculate the activity comment depth for
regular activity updates (`'activity_update'`). However, it is possible
for other activity types to have activity comments attached to them. For
example, since the introduction of comment syncing in 2.0, it is now
possible for activity comments to be attached to `'new_blog_post'` items.
When fetching activity comments attached to other activity types (as in the
case when using the "New Comments" activity dropdown filter), an infinite
loop can occur while traversing up the activity tree to calculate the
activity comment depth.
This commit fixes this by checking if the parent activity item is not an
activity update during activity comment depth calculation. If the parent
activity is not an activity update, we have reached the top of the tree can
bail from the recursive depth check.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6518">#6518</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityclassesclassbpactivityactivityphp">trunk/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityclassesclassbpactivityactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/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">--- trunk/src/bp-activity/classes/class-bp-activity-activity.php 2015-06-22 14:14:25 UTC (rev 9960)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2015-06-22 19:17:05 UTC (rev 9961)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,21 +1414,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ref as &$r ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $depth = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id = $r->secondary_item_id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( $parent_id !== $r->item_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $depth++;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // When display_comments=stream, the
- // parent comment may not be part of
- // the returned results, so we manually
- // fetch it
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // When display_comments=stream, the parent comment may not be part of the
+ // returned results, so we manually fetch it
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $ref[ $parent_id ] ) ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = $direct_parent->secondary_item_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the direct parent is not an activity update, that means we've reached
+ // the parent activity item (eg. new_blog_post)
+ if ( 'activity_update' !== $direct_parent->type ) {
+ $parent_id = $r->item_id;
+
+ } else {
+ $parent_id = $direct_parent->secondary_item_id;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Something went wrong
- // Short-circuit the
- // depth calculation
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Something went wrong. Short-circuit the depth calculation
</ins><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="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>