Changeset 5427

Timestamp:

12/01/2011 05:02:54 PM (13 years ago)

Author:

djpaul

Message:

Revert part of r5426 (See #3660). Reinstates part of r5408.

File:

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

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

@@ -198 +198 @@
 
         // Is this a bulk request?
-        if ( 'bulk_' == substr( $doaction, 0, 5 ) && !empty( $_REQUEST['aid'] ) ) {
+        if ( 'bulk_' == substr( $doaction, 0, 5 ) && ! empty( $_REQUEST['aid'] ) ) {
             // Check this is a valid form submission
             check_admin_referer( 'bulk-activities' );
@@ -855 +855 @@
     function column_response( $item ) {
         // Is $item is a root activity?
-        if ( empty( $item['item_id'] ) ) {
+        if ( empty( $item['item_id'] ) || ! in_array( $item['type'], apply_filters( 'bp_activity_admin_root_activity_types', array( 'activity_comment' ), $item ) ) ) {
             $comment_count     = !empty( $item['children'] ) ? bp_activity_recurse_comment_count( (object) $item ) : 0;
             $root_activity_url = network_admin_url( 'admin.php?page=bp-activity&aid=' . $item['id'] );