Ticket #4590: 4590.diff

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

@@ -4446 +4446 @@
          * @since 2.1.0
          *
          * @param string $context The current context. 'activity', 'member',
-         *                        'member_groups', 'group'.
+         *                        'member_groups', 'group', 'mentions'.
          *
          * @return string HTML for <option> values.
          */
@@ -4455 +4455 @@
                 if ( empty( $context ) ) {
 
                         // On member pages, default to 'member', unless this
-                        // is a user's Groups activity.
+                        // is a user's Groups activity or a user's mentions activity.
                         if ( bp_is_user() ) {
                                 if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
                                         $context = 'member_groups';
+                                } elseif ( bp_is_current_action( 'mentions' ) ) {
+                                        $context = 'mentions';
                                 } else {
                                         $context = 'member';
                                 }
@@ -4498 +4500 @@
                  * @since 2.2.0
                  *
                  * @param array  $filters Array of filter options for the given context, in the following format: $option_value => $option_name.
-                 * @param string $context Context for the filter. 'activity', 'member', 'member_groups', 'group'.
+                 * @param string $context Context for the filter. 'activity', 'member', 'member_groups', 'group', 'mentions'.
                  */
                 $filters = apply_filters( 'bp_get_activity_show_filters_options', $filters, $context );
 
@@ -4518 +4520 @@
                  *
                  * @param string $output  HTML output for the activity filter dropdown.
                  * @param array  $filters Array of filter options for the given context, in the following format: $option_value => $option_name.
-                 * @param string $context Context for the filter. 'activity', 'member', 'member_groups', 'group'.
+                 * @param string $context Context for the filter. 'activity', 'member', 'member_groups', 'group', 'mentions'.
                  */
                 return apply_filters( 'bp_get_activity_show_filters', $output, $filters, $context );
         }