Changeset 11651 for trunk/src/bp-templates/bp-legacy/buddypress-functions.php

Timestamp:

07/26/2017 07:03:49 PM (7 years ago)

Author:

r-a-y

Message:

bp-legacy: After r11356, fix issues with filtering multiple activity actions.

In #4062, we started to validate activity actions against a given context.
However, we did not take into account the validation of multiple activity
actions during AJAX activity filtering. This broke the "Friendships"
dropdown filter since it uses a comma-separated action value of
friendship_accepted,friendship_created.

This commit remedies this by accepting multiple activity actions and
cross-referencing it against the registered activity actions for the AJAX
activity querystring.

Props imath.

Fixes #7562 (trunk).

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -693 +693 @@
         if ( bp_is_active( 'activity' ) ) {
             $actions = bp_activity_get_actions_for_context();
-            foreach ( $actions as $action ) {
-                if ( $action['key'] === $_BP_COOKIE['bp-' . $object . '-filter'] ) {
-                    $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter'];
-                }
+
+            // Handle multiple actions (eg. 'friendship_accepted,friendship_created')
+            $action_filter = explode( ',', $_BP_COOKIE['bp-' . $object . '-filter'] );
+
+            // See if action filter matches registered actions. If so, add it to qs.
+            if ( ! array_diff( $action_filter, wp_list_pluck( $actions, 'key' ) ) ) {
+                $qs[] = 'action=' . join( ',', $action_filter );
             }
         }