Changeset 8126 for trunk/bp-activity/bp-activity-functions.php

Timestamp:

03/13/2014 07:05:27 PM (13 years ago)

Author:

boonebgorges

Message:

Use WP Plugin API rather than call_user_func() to apply format_callback to activity actions

This allows plugin authors to modify or override default formatting callbacks
using the standard remove_filter() and add_filter() API functions.

Hat-tip to nacin for the idea

See #3856

File:

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

trunk/bp-activity/bp-activity-functions.php

@@ -913 +913 @@
         }
 
-        return call_user_func( buddypress()->activity->actions->{$activity->component}->{$activity->type}['format_callback'], $activity );
+        // We apply the format_callback as a filter
+        add_filter( 'bp_activity_generate_action_string', buddypress()->activity->actions->{$activity->component}->{$activity->type}['format_callback'], 10, 2 );
+
+        // Generate the action string (run through the filter defined above)
+        $action = apply_filters( 'bp_activity_generate_action_string', $activity->action, $activity );
+
+        // Remove the filter for future activity items
+        remove_filter( 'bp_activity_generate_action_string', buddypress()->activity->actions->{$activity->component}->{$activity->type}['format_callback'], 10, 2 );
+
+        return $action;
 }
 
@@ -921 +930 @@
  * @since BuddyPress (2.0.0)
  *
+ * @param string $action Static activity action.
  * @param object $activity Activity data object.
  * @return string
  */
-function bp_activity_format_activity_action_activity_update( $activity ) {
+function bp_activity_format_activity_action_activity_update( $action, $activity ) {
         $action = sprintf( __( '%s posted an update', 'buddypress' ), bp_core_get_userlink( $activity->user_id ) );
         return apply_filters( 'bp_activity_new_update_action', $action, $activity );
@@ -934 +944 @@
  * @since BuddyPress (2.0.0)
  *
+ * @param string $action Static activity action.
  * @param object $activity Activity data object.
  * @return string
  */
-function bp_activity_format_activity_action_activity_comment( $activity ) {
+function bp_activity_format_activity_action_activity_comment( $action, $activity ) {
         $action = sprintf( __( '%s posted a new activity comment', 'buddypress' ), bp_core_get_userlink( $activity->user_id ) );
         return apply_filters( 'bp_activity_comment_action', $action, $activity );