<!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][5419] trunk/bp-activity/bp-activity-admin.php: On the Activity admin screen, when filtered to show a specific activity (via speech bubble), display all its child activities on the same screen.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5419">5419</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-11-30 07:32:53 +0000 (Wed, 30 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>On the Activity admin screen, when filtered to show a specific activity (via speech bubble), display all its child activities on the same screen. See <a href="http://buddypress.trac.wordpress.org/ticket/3660">#3660</a>. Props Tom J Nowell and Lee Willis</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5418 => 5419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2011-11-29 23:09:34 UTC (rev 5418)
+++ trunk/bp-activity/bp-activity-admin.php 2011-11-30 07:32:53 UTC (rev 5419)
</span><span class="lines">@@ -491,6 +491,15 @@
</span><span class="cx"> 'spam' => $spam,
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ // If we're viewing a specific activity, flatten all activites into a single array.
+ if ( $include_id ) {
+ $activities['activities'] = BP_Activity_List_Table::flatten_activity_array( $activities['activities'] );
+ $activities['total'] = count( $activities['activities'] );
+
+ // Sort the array by the activity object's date_recorded value
+ usort( $activities['activities'], create_function( '$a, $b', 'return $a->date_recorded > $b->date_recorded;' ) );
+ }
+
</ins><span class="cx"> // bp_activity_get returns an array of objects; cast these to arrays for WP_List_Table.
</span><span class="cx"> $new_activities = array();
</span><span class="cx"> foreach ( $activities['activities'] as $activity_item ) {
</span><span class="lines">@@ -500,10 +509,6 @@
</span><span class="cx"> $this->activity_user_id[$activity_item->id] = $activity_item->user_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // @todo If we're viewing a specific activity, check/merge $activity->children into the main list (recursive).
- /*if ( $include_id ) {
- }*/
-
</del><span class="cx"> // Set raw data to display
</span><span class="cx"> $this->items = $new_activities;
</span><span class="cx"> $this->extra_items = array();
</span><span class="lines">@@ -870,5 +875,27 @@
</span><span class="cx"> return $activity['activities'][0]->user_id;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Helper function to flatten all activites returned from bp_activity_get() into a single array.
+ *
+ * @param array $tree Source array
+ * @return array Flattened array
+ * @since 1.6
+ */
+ public static function flatten_activity_array( $tree ){
+ foreach ( (array) $tree as $node ) {
+ if ( isset( $node->children ) ) {
+
+ foreach ( BP_Activity_List_Table::flatten_activity_array( $node->children ) as $child ) {
+ $tree[] = $child;
+ }
+
+ unset( $node->children );
+ }
+ }
+
+ return $tree;
+ }
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>