Changeset 9382

Timestamp:

01/20/2015 06:50:52 PM (10 years ago)

Author:

boonebgorges

Message:

In bp_activity_generate_action_string(), use bp_activity_get_actions() rather than touching global directly.

This change ensures that the filters called by bp_activity_get_actions() are
run, which gives a chance for dynamically registered actions to register
themselves just in time whenever an activity string needs to be generated.

This change is a more general fix than the one introduced in [9366], so that
changeset (minus its unit tests) has been rolled back. See #6126.

Fixes #6141.

Location:

trunk/src/bp-activity

Files:

• bp-activity-classes.php (modified) (1 diff)
• bp-activity-functions.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-classes.php

@@ -163 +163 @@
             $this->is_spam           = $row->is_spam;
         }
-
-        /**
-         * Make sure the activity actions have been registered.
-         * We can't assume it will already be set because this is normally only done on an ad-hoc basis.
-         *
-         * @link https://buddypress.trac.wordpress.org/ticket/6126
-         */
-        bp_activity_get_actions();
 
         // Generate dynamic 'action' when possible

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

@@ -1250 +1250 @@
 
     // Check for registered format callback
-    if ( empty( buddypress()->activity->actions->{$activity->component}->{$activity->type}['format_callback'] ) ) {
+    $actions = bp_activity_get_actions();
+    if ( empty( $actions->{$activity->component}->{$activity->type}['format_callback'] ) ) {
         return false;
     }
 
     // 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 );
+    add_filter( 'bp_activity_generate_action_string', $actions->{$activity->component}->{$activity->type}['format_callback'], 10, 2 );
 
     /**
@@ -1268 +1269 @@
 
     // 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 );
+    remove_filter( 'bp_activity_generate_action_string', $actions->{$activity->component}->{$activity->type}['format_callback'], 10, 2 );
 
     return $action;