Changeset 5419

Timestamp:

11/30/2011 07:32:53 AM (15 years ago)

Author:

djpaul

Message:

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 #3660. Props Tom J Nowell and Lee Willis

File:

• trunk/bp-activity/bp-activity-admin.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-admin.php

@@ -492 +492 @@
                 ) );
 
+                // 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;' ) );
+                }
+
                 // bp_activity_get returns an array of objects; cast these to arrays for WP_List_Table.
                 $new_activities = array();
@@ -500 +509 @@
                         $this->activity_user_id[$activity_item->id] = $activity_item->user_id;
                 }
-
-                // @todo If we're viewing a specific activity, check/merge $activity->children into the main list (recursive).
-                /*if ( $include_id ) {
-                }*/
 
                 // Set raw data to display
@@ -871 +876 @@
                 }
         }
+
+        /**
+         * 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;
+        }
 }
 ?>