Changeset 12563

Timestamp:

03/03/2020 08:54:03 PM (5 years ago)

Author:

r-a-y

Message:

Activity Admin: Mirror 'bp_get_activity_action' filter arguments.

The main 'bp_get_activity_action' filter uses 3 parameters. We need
to mirror all filter arguments to prevent a potential fatal error from
occurring in the activity dashboard.

Fixes #8234.

File:

• trunk/src/bp-activity/classes/class-bp-activity-list-table.php (modified) (1 diff)

trunk/src/bp-activity/classes/class-bp-activity-list-table.php

@@ -697 +697 @@
         echo '</div>';
 
+        $activity = new BP_Activity_Activity( $item['id'] );
+
         // Get activity content - if not set, use the action.
         if ( ! empty( $item['content'] ) ) {
-            $activity = new BP_Activity_Activity( $item['id'] );
-
             /** This filter is documented in bp-activity/bp-activity-template.php */
             $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $item['content'], &$activity ) );
         } else {
-            /**
-             * Filters current activity item action.
-             *
-             * @since 1.2.0
-             *
-             * @var array $item Array index holding current activity item action.
-             */
-            $content = apply_filters_ref_array( 'bp_get_activity_action', array( $item['action'] ) );
+            // Emulate bp_get_activity_action().
+            $r = array(
+                'no_timestamp' => false,
+            );
+
+            /** This filter is documented in bp-activity/bp-activity-template.php */
+            $content = apply_filters_ref_array( 'bp_get_activity_action', array( $item['action'], &$activity, $r ) );
         }