Ticket #8464: 8464.patch

src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php

@@ -8 +8 @@
 ?>
 <div class="subnav-filters filters no-ajax" id="subnav-filters">
 
-        <?php if ( bp_get_friends_slug() !== bp_current_component() ) : ?>
+        <?php if ( bp_nouveau_get_component_slug( 'friends' ) !== bp_current_component() ) : ?>
                 <div class="subnav-search clearfix">
 
-                        <?php if ( bp_nouveau_is_feed_enable() ) : ?>
+                        <?php if ( bp_nouveau_get_component_slug( 'activity' ) === bp_current_component() && bp_nouveau_is_feed_enable() ) : ?>
                                 <div id="activity-rss-feed" class="feed">
                                         <a href="<?php bp_nouveau_activity_rss_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php bp_nouveau_activity_rss_tooltip(); ?>">
                                                 <span class="bp-screen-reader-text"><?php bp_nouveau_activity_rss_screen_reader_text(); ?></span>
@@ -26 +26 @@
 
         <?php if ( bp_is_user() && ! bp_is_current_action( 'requests' ) ) : ?>
                 <?php bp_get_template_part( 'common/filters/user-screens-filters' ); ?>
-        <?php elseif ( bp_get_groups_slug() === bp_current_component() ) : ?>
+        <?php elseif ( bp_nouveau_get_component_slug( 'groups' ) === bp_current_component() ) : ?>
                 <?php bp_get_template_part( 'common/filters/groups-screens-filters' ); ?>
         <?php else : ?>
                 <?php bp_get_template_part( 'common/filters/directory-filters' ); ?>

src/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php

@@ -3 +3 @@
  * BuddyPress - Members Settings ( Capabilities )
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 8.0.0
  */
 
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
@@ -12 +12 @@
         <?php esc_html_e( 'Members Capabilities', 'buddypress' ); ?>
 </h2>
 
-<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/capabilities/' ); ?>" name="account-capabilities-form" id="account-capabilities-form" class="standard-form" method="post">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/capabilities/' ); ?>" name="account-capabilities-form" id="account-capabilities-form" class="standard-form" method="post">
 
         <label for="user-spammer">
                 <input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />

src/bp-templates/bp-nouveau/buddypress/members/single/settings/data.php

@@ -3 +3 @@
  * BuddyPress - Members Settings (Export Data)
  *
  * @since 3.1.0
- * @version 3.1.0
+ * @version 8.0.0
  */
 
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
@@ -63 +63 @@
 </h2>
 
 <?php /* translators: Link to Delete Account Settings page */ ?>
-<p><?php esc_html_e( 'To erase all data associated with your account, your user account must be completely deleted.', 'buddypress' ); ?> <?php if ( bp_disable_account_deletion() ) : ?><?php esc_html_e( 'Please contact the site administrator to request account deletion.', 'buddypress' ); ?><?php else : ?><?php printf( esc_html__( 'You may delete your account by visiting the %s page.', 'buddypress' ), sprintf( '<a href="%s">%s</a>', bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account/', esc_html__( 'Delete Account', 'buddypress' ) ) ); ?><?php endif; ?></p>
+<p><?php esc_html_e( 'To erase all data associated with your account, your user account must be completely deleted.', 'buddypress' ); ?> <?php if ( bp_disable_account_deletion() ) : ?><?php esc_html_e( 'Please contact the site administrator to request account deletion.', 'buddypress' ); ?><?php else : ?><?php printf( esc_html__( 'You may delete your account by visiting the %s page.', 'buddypress' ), sprintf( '<a href="%s">%s</a>', bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/delete-account/', esc_html__( 'Delete Account', 'buddypress' ) ) ); ?><?php endif; ?></p>
 
 <?php
 bp_nouveau_member_hook( 'after', 'settings_template' );

src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php

@@ -3 +3 @@
  * BuddyPress - Members Settings ( Delete Account )
  *
  * @since 3.0.0
- * @version 7.0.0
+ * @version 8.0.0
  */
 
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
@@ -14 +14 @@
 
 <?php bp_nouveau_user_feedback( 'member-delete-account' ); ?>
 
-<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account' ); ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/delete-account' ); ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
 
         <label id="delete-account-understand" class="warn" for="delete-account-understand">
                 <input class="disabled" type="checkbox" name="delete-account-understand" value="1" data-bp-disable-input="delete-account-button" />

src/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php

@@ -3 +3 @@
  * BuddyPress - Members Settings ( General )
  *
  * @since 3.0.0
- * @version 5.0.0
+ * @version 8.0.0
  */
 
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
@@ -16 +16 @@
         <?php esc_html_e( 'Update your email and or password.', 'buddypress' ); ?>
 </p>
 
-<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/general' ); ?>" method="post" class="standard-form" id="your-profile">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/general' ); ?>" method="post" class="standard-form" id="your-profile">
 
         <?php if ( ! is_super_admin() ) : ?>
 

src/bp-templates/bp-nouveau/buddypress/members/single/settings/group-invites.php

@@ -3 +3 @@
  * BuddyPress - Members Settings ( Group Invites )
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 8.0.0
  */
 ?>
 
@@ -20 +20 @@
 ?>
 
 
-<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/invites/' ); ?>" name="account-group-invites-form" id="account-group-invites-form" class="standard-form" method="post">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/invites/' ); ?>" name="account-group-invites-form" id="account-group-invites-form" class="standard-form" method="post">
 
         <label for="account-group-invites-preferences">
                 <input type="checkbox" name="account-group-invites-preferences" id="account-group-invites-preferences" value="1" <?php checked( 1, bp_nouveau_groups_get_group_invites_setting() ); ?>/>

src/bp-templates/bp-nouveau/buddypress/members/single/settings/notifications.php

@@ -16 +16 @@
         <?php _e( 'Set your email notification preferences.', 'buddypress' ); ?>
 </p>
 
-<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications' ); ?>" method="post" class="standard-form" id="settings-form">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/notifications' ); ?>" method="post" class="standard-form" id="settings-form">
 
         <?php bp_nouveau_member_email_notice_settings(); ?>
 

src/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php

@@ -3 +3 @@
  * BuddyPress - Members Settings ( Profile )
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 8.0.0
  */
 
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
@@ -16 +16 @@
         <?php esc_html_e( 'Select who may see your profile details.', 'buddypress' ); ?>
 </p>
 
-<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/profile/' ); ?>" method="post" class="standard-form" id="settings-form">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) . '/profile/' ); ?>" method="post" class="standard-form" id="settings-form">
 
         <?php if ( bp_xprofile_get_settings_fields() ) : ?>
 

src/bp-templates/bp-nouveau/includes/activity/ajax.php

@@ -3 +3 @@
  * Activity Ajax functions
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 8.0.0
  */
 
 // Exit if accessed directly.
@@ -115 +115 @@
 
                         if ( 1 === $fav_count ) {
                                 $response['directory_tab'] = '<li id="activity-favorites" data-bp-scope="favorites" data-bp-object="activity">
-                                        <a href="' . bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/">
+                                        <a href="' . bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/favorites/">
                                                 ' . esc_html__( 'My Favorites', 'buddypress' ) . '
                                         </a>
                                 </li>';

src/bp-templates/bp-nouveau/includes/activity/functions.php

@@ -3 +3 @@
  * Activity functions
  *
  * @since 3.0.0
- * @version 7.0.0
+ * @version 8.0.0
  */
 
 // Exit if accessed directly.
@@ -226 +226 @@
                                 'component' => 'activity',
                                 'slug'      => 'favorites', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array(),
-                                'link'      => bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/',
+                                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/favorites/',
                                 'text'      => __( 'My Favorites', 'buddypress' ),
                                 'count'     => false,
                                 'position'  => 35,
@@ -239 +239 @@
                                 'component' => 'activity',
                                 'slug'      => 'friends', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array( 'dynamic' ),
-                                'link'      => bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/',
+                                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/' . bp_nouveau_get_component_slug( 'friends' ) . '/',
                                 'text'      => __( 'My Friends', 'buddypress' ),
                                 'count'     => '',
                                 'position'  => 15,
@@ -252 +252 @@
                                 'component' => 'activity',
                                 'slug'      => 'groups', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array( 'dynamic' ),
-                                'link'      => bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/',
+                                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/' . bp_nouveau_get_component_slug( 'groups' ) . '/',
                                 'text'      => __( 'My Groups', 'buddypress' ),
                                 'count'     => '',
                                 'position'  => 25,
@@ -272 +272 @@
                                 'component' => 'activity',
                                 'slug'      => 'mentions', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array( 'dynamic' ),
-                                'link'      => bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/',
+                                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/mentions/',
                                 'text'      => __( 'Mentions', 'buddypress' ),
                                 'count'     => $count,
                                 'position'  => 45,

src/bp-templates/bp-nouveau/includes/activity/template-tags.php

@@ -514 +514 @@
                         }
 
                         $buttons['activity_spam']['button_attr'][ $data_element ] = wp_nonce_url(
-                                bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . $activity_id . '/',
+                                bp_get_root_domain() . '/' . bp_nouveau_get_component_slug( 'activity' ) . '/spam/' . $activity_id . '/',
                                 'bp_activity_akismet_spam_' . $activity_id
                         );
                 }
@@ -842 +842 @@
                         }
 
                         $buttons['activity_comment_spam']['button_attr'][ $data_element ] = wp_nonce_url(
-                                bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . $activity_comment_id . '/?cid=' . $activity_comment_id,
+                                bp_get_root_domain() . '/' . bp_nouveau_get_component_slug( 'activity' ) . '/spam/' . $activity_comment_id . '/?cid=' . $activity_comment_id,
                                 'bp_activity_akismet_spam_' . $activity_comment_id
                         );
                 }

src/bp-templates/bp-nouveau/includes/ajax.php

@@ -3 +3 @@
  * Common functions only loaded on AJAX requests.
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 8.0.0
  */
 
 // Exit if accessed directly.
@@ -48 +48 @@
                 // We need to calculate and return the feed URL for each scope.
                 switch ( $scope ) {
                         case 'friends':
-                                $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/friends/feed/';
+                                $feed_url = bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/friends/feed/';
                                 break;
                         case 'groups':
-                                $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/groups/feed/';
+                                $feed_url = bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/groups/feed/';
                                 break;
                         case 'favorites':
-                                $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/feed/';
+                                $feed_url = bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/favorites/feed/';
                                 break;
                         case 'mentions':
-                                $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/feed/';
+                                $feed_url = bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/mentions/feed/';
 
                                 // Get user new mentions
                                 $new_mentions = bp_get_user_meta( bp_loggedin_user_id(), 'bp_new_mentions', true );

src/bp-templates/bp-nouveau/includes/blogs/functions.php

@@ -34 +34 @@
                                 'component' => 'blogs',
                                 'slug'      => 'personal', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array(),
-                                'link'      => bp_loggedin_user_domain() . bp_get_blogs_slug(),
+                                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'blogs' ),
                                 'text'      => __( 'My Sites', 'buddypress' ),
                                 'count'     => $my_blogs_count,
                                 'position'  => 15,

src/bp-templates/bp-nouveau/includes/functions.php

@@ -1391 +1391 @@
 
         return true;
 }
+
+/**
+ * Gets the component's slug thanks to its ID.
+ *
+ * @since 8.0.0
+ *
+ * @param string $component_id The component ID.
+ * @return string The slug for the requested component ID.
+ */
+function bp_nouveau_get_component_slug( $component_id = '' ) {
+        $slug = '';
+
+        if ( bp_is_active( $component_id ) ) {
+                switch ( $component_id ) {
+                        case 'activity':
+                                $slug = bp_get_activity_slug();
+                                break;
+                        case 'blogs':
+                                $slug = bp_get_blogs_slug();
+                                break;
+                        case 'friends':
+                                $slug = bp_get_friends_slug();
+                                break;
+                        case 'groups':
+                                $slug = bp_get_groups_slug();
+                                break;
+                        case 'messages':
+                                $slug = bp_get_messages_slug();
+                                break;
+                        case 'notifications':
+                                $slug = bp_get_notifications_slug();
+                                break;
+                        case 'settings':
+                                $slug = bp_get_settings_slug();
+                                break;
+                        case 'xprofile':
+                                $slug = bp_get_profile_slug();
+                                break;
+                }
+        }
+
+        // Defaults to the component ID.
+        if ( ! $slug ) {
+                $slug = $component_id;
+        }
+
+        /**
+         * Filter here to edit the slug for the requested component ID.
+         *
+         * @since 8.0.0
+         *
+         * @param string $slug         The slug for the requested component ID.
+         * @param string $component_id The component ID.
+         */
+        return apply_filters( 'bp_nouveau_get_component_slug', $slug, $component_id );
+}

src/bp-templates/bp-nouveau/includes/groups/functions.php

@@ -424 +424 @@
  * @since 3.0.0
  */
 function bp_nouveau_groups_invites_restriction_nav() {
-        $slug        = bp_get_settings_slug();
+        $slug        = bp_nouveau_get_component_slug( 'settings' );
         $user_domain = bp_loggedin_user_domain();
 
         if ( bp_displayed_user_domain() ) {
@@ -454 +454 @@
  */
 function bp_nouveau_groups_invites_restriction_admin_nav( $wp_admin_nav ) {
         // Setup the logged in user variables.
-        $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
+        $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'settings' ) );
 
         // Add the "Group Invites" subnav item.
         $wp_admin_nav[] = array(
@@ -495 +495 @@
                         bp_core_add_message( __( 'You are not allowed to perform this action.', 'buddypress' ), 'error' );
                 }
 
-                bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_settings_slug() ) . 'invites/' );
+                bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'settings' ) ) . 'invites/' );
         }
 
         /**
@@ -568 +568 @@
                                 'component' => 'groups',
                                 'slug'      => 'personal', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array(),
-                                'link'      => bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups/',
+                                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'groups' ) . '/my-groups/',
                                 'text'      => __( 'My Groups', 'buddypress' ),
                                 'count'     => $my_groups_count,
                                 'position'  => 15,

src/bp-templates/bp-nouveau/includes/members/functions.php

@@ -58 +58 @@
                                 'component' => 'members',
                                 'slug'      => 'personal', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array(),
-                                'link'      => bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/',
+                                'link'      => bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'friends' ) . '/my-friends/',
                                 'text'      => __( 'My Friends', 'buddypress' ),
                                 'count'     => bp_get_total_friend_count( bp_loggedin_user_id() ),
                                 'position'  => 15,

src/bp-templates/bp-nouveau/includes/members/template-tags.php

@@ -449 +449 @@
                                                         'class' => $parent_class,
                                                 ),
                                                 'button_attr'       => array(
-                                                        'href'  => trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() ) . 'compose?r=' . bp_core_get_username( $user_id ),
+                                                        'href'  => trailingslashit( bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'messages' ) ) . 'compose?r=' . bp_core_get_username( $user_id ),
                                                         'id'    => false,
                                                         'class' => $button_args['link_class'],
                                                         'rel'   => '',
                                                         'title' => '',
-                                                        ),
+                                                ),
                                         );
 
                                         unset( bp_nouveau()->members->button_args );

src/bp-templates/bp-nouveau/includes/messages/functions.php

@@ -116 +116 @@
                         /* translators: %s: number of message recipients */
                         'more' => __( '(and %d others)', 'buddypress' ),
                 ),
-                'rootUrl' => parse_url( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ), PHP_URL_PATH ),
+                'rootUrl' => parse_url( trailingslashit( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'messages' ) ), PHP_URL_PATH ),
         );
 
         // Star private messages.
@@ -145 +145 @@
 function bp_nouveau_messages_adjust_nav() {
         $bp = buddypress();
 
-        $secondary_nav_items = $bp->members->nav->get_secondary( array( 'parent_slug' => bp_get_messages_slug() ), false );
+        $secondary_nav_items = $bp->members->nav->get_secondary( array( 'parent_slug' => bp_nouveau_get_component_slug( 'messages' ) ), false );
 
         if ( empty( $secondary_nav_items ) ) {
                 return;
@@ -157 +157 @@
                 }
 
                 if ( 'notices' === $secondary_nav_item->slug ) {
-                        bp_core_remove_subnav_item( bp_get_messages_slug(), $secondary_nav_item->slug, 'members' );
+                        bp_core_remove_subnav_item( bp_nouveau_get_component_slug( 'messages' ), $secondary_nav_item->slug, 'members' );
                 } elseif ( 'compose' === $secondary_nav_item->slug ) {
                         $bp->members->nav->edit_nav( array(
                                 'user_has_access' => bp_is_my_profile()
-                        ), $secondary_nav_item->slug, bp_get_messages_slug() );
+                        ), $secondary_nav_item->slug, bp_nouveau_get_component_slug( 'messages' ) );
                 }
         }
 }
@@ -174 +174 @@
                 return $admin_nav;
         }
 
-        $user_messages_link = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() );
+        $user_messages_link = trailingslashit( bp_loggedin_user_domain() . bp_nouveau_get_component_slug( 'messages' ) );
 
         foreach ( $admin_nav as $nav_iterator => $nav ) {
                 $nav_id = str_replace( 'my-account-messages-', '', $nav['id'] );

src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -3 +3 @@
  * Common template tags
  *
  * @since 3.0.0
- * @version 7.0.0
+ * @version 8.0.0
  */
 
 // Exit if accessed directly.
@@ -2239 +2239 @@
         function bp_nouveau_get_filter_options() {
                 $output = '';
 
-                if ( bp_get_notifications_slug() === bp_current_component() ) {
+                if ( bp_nouveau_get_component_slug( 'notifications' ) === bp_current_component() ) {
                         $output = bp_nouveau_get_notifications_filters();
 
                 } else {
@@ -2720 +2720 @@
                                 $retval = bp_activity_is_feed_enable( 'personal' );
 
                                 if ( $retval ) {
-                                        $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_get_activity_slug() . '/feed' );
+                                        $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/feed' );
                                 }
 
-                                if ( bp_is_active( 'friends' ) && bp_is_current_action( bp_get_friends_slug() ) ) {
+                                if ( bp_is_active( 'friends' ) && bp_is_current_action( bp_nouveau_get_component_slug( 'friends' ) ) ) {
                                         $retval = bp_activity_is_feed_enable( 'friends' );
 
                                         if ( $retval ) {
-                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed' );
+                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/' . bp_nouveau_get_component_slug( 'friends' ) . '/feed' );
                                         }
-                                } elseif ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
+                                } elseif ( bp_is_active( 'groups' ) && bp_is_current_action( bp_nouveau_get_component_slug( 'groups' ) ) ) {
                                         $retval = bp_activity_is_feed_enable( 'mygroups' );
 
                                         if ( $retval ) {
-                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/feed' );
+                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/' . bp_nouveau_get_component_slug( 'groups' ) . '/feed' );
                                         }
                                 } elseif ( bp_activity_do_mentions() && bp_is_current_action( 'mentions' ) ) {
                                         $retval = bp_activity_is_feed_enable( 'mentions' );
 
                                         if ( $retval ) {
-                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_get_activity_slug() . '/mentions/feed' );
+                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/mentions/feed' );
                                         }
                                 } elseif ( bp_activity_can_favorite() && bp_is_current_action( 'favorites' ) ) {
                                         $retval = bp_activity_is_feed_enable( 'mentions' );
 
                                         if ( $retval ) {
-                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_get_activity_slug() . '/favorites/feed' );
+                                                $bp_nouveau->activity->current_rss_feed['link'] = trailingslashit( bp_displayed_user_domain() . bp_nouveau_get_component_slug( 'activity' ) . '/favorites/feed' );
                                         }
                                 }
                         }