Ticket #7562: 7562.patch

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

@@ -692 +692 @@
 
                 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'];
-                                }
+
+                        // Accepts multiple actions in comma separated values (eg: 'friendship_accepted,friendship_created')
+                        $action_filter = explode( ',', $_BP_COOKIE['bp-' . $object . '-filter'] );
+
+                        // If All actions are available fot the context, include them into the query string
+                        if ( ! array_diff( $action_filter, wp_list_pluck( $actions, 'key' ) ) ) {
+                                $qs[] = 'action=' . join( ',', $action_filter );
                         }
                 }
         }