Ticket #4062: 4062.2.diff

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

@@ -839 +839 @@
         return apply_filters( 'bp_activity_get_types', $actions );
 }
 
+/**
+ * Gets the current activity context.
+ *
+ * The "context" is the current view type, corresponding roughly to the
+ * current component. Use this context to determine which activity actions
+ * should be whitelisted for the filter dropdown.
+ *
+ * @since 2.8.0
+ *
+ * @return string Activity context. 'member', 'member_groups', 'group', 'activity'.
+ */
+function bp_activity_get_current_context() {
+        // On member pages, default to 'member', unless this is a user's Groups activity.
+        if ( bp_is_user() ) {
+                if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
+                        $context = 'member_groups';
+                } else {
+                        $context = 'member';
+                }
+
+        // On individual group pages, default to 'group'.
+        } elseif ( bp_is_active( 'groups' ) && bp_is_group() ) {
+                $context = 'group';
+
+        // 'activity' everywhere else.
+        } else {
+                $context = 'activity';
+        }
+
+        return $context;
+}
+
+/**
+ * Gets a flat list of activity actions compatible with a given context.
+ *
+ * @since 2.8.0
+ *
+ * @param string $context Optional. Name of the context. Defaults to the current context.
+ * @return array
+ */
+function bp_activity_get_actions_for_context( $context = '' ) {
+        if ( ! $context ) {
+                $context = bp_activity_get_current_context();
+        }
+
+        $actions = array();
+        foreach ( bp_activity_get_actions() as $component_actions ) {
+                foreach ( $component_actions as $component_action ) {
+                        if ( in_array( $context, (array) $component_action['context'], true ) ) {
+                                $actions[] = $component_action;
+                        }
+                }
+        }
+
+        return $actions;
+}
+
 /** Favorites ****************************************************************/
 
 /**

src/bp-activity/bp-activity-template.php

@@ -3800 +3800 @@
          * @return string HTML for <option> values.
          */
         function bp_get_activity_show_filters( $context = '' ) {
-                // Set default context based on current page.
-                if ( empty( $context ) ) {
-
-                        // On member pages, default to 'member', unless this
-                        // is a user's Groups activity.
-                        if ( bp_is_user() ) {
-                                if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
-                                        $context = 'member_groups';
-                                } else {
-                                        $context = 'member';
-                                }
-
-                        // On individual group pages, default to 'group'.
-                        } elseif ( bp_is_active( 'groups' ) && bp_is_group() ) {
-                                $context = 'group';
-
-                        // 'activity' everywhere else.
-                        } else {
-                                $context = 'activity';
-                        }
-                }
-
                 $filters = array();
-
-                // Walk through the registered actions, and prepare an the
-                // select box options.
-                foreach ( bp_activity_get_actions() as $actions ) {
-                        foreach ( $actions as $action ) {
-                                if ( ! in_array( $context, (array) $action['context'] ) ) {
-                                        continue;
-                                }
-
-                                // Friends activity collapses two filters into one.
-                                if ( in_array( $action['key'], array( 'friendship_accepted', 'friendship_created' ) ) ) {
-                                        $action['key'] = 'friendship_accepted,friendship_created';
-                                }
-
-                                $filters[ $action['key'] ] = $action['label'];
+                $actions = bp_activity_get_actions_for_context( $context );
+                foreach ( $actions as $action ) {
+                        // Friends activity collapses two filters into one.
+                        if ( in_array( $action['key'], array( 'friendship_accepted', 'friendship_created' ) ) ) {
+                                $action['key'] = 'friendship_accepted,friendship_created';
                         }
+
+                        $filters[ $action['key'] ] = $action['label'];
                 }
 
                 /**

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

@@ -687 +687 @@
 
         // Activity stream filtering on action.
         if ( ! empty( $_BP_COOKIE['bp-' . $object . '-filter'] ) && '-1' != $_BP_COOKIE['bp-' . $object . '-filter'] ) {
-                $qs[] = 'type='   . $_BP_COOKIE['bp-' . $object . '-filter'];
-                $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter'];
+                $actions = bp_activity_get_actions_for_context();
+                foreach ( $actions as $action ) {
+                        if ( $action['key'] === $_BP_COOKIE['bp-' . $object . '-filter'] ) {
+                                $qs[] = 'type='   . $_BP_COOKIE['bp-' . $object . '-filter'];
+                                $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter'];
+                        }
+                }
         }
 
         if ( ! empty( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {