Ticket #3226: fix-showing-appropriate-feed-names.patch

wp-content/plugins/buddypress/bp-activity/bp-activity-templatetags.php

@@ -1000 +1000 @@
                 else if ( 'mentions' == $bp->current_action )
                         $link = $bp->displayed_user->domain . $bp->activity->slug . '/mentions/feed/';
 
-                return apply_filters( 'bp_get_activities_member_rss_link', $link );
+                return apply_filters( 'bp_get_activities_member_feed_link', $link );
         }
         function bp_get_activities_member_rss_link() { return bp_get_member_activity_feed_link(); }
 
+function bp_get_member_current_activity_feed_title() {
+  global $bp;
+
+  if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action )
+    $name = 'Personal';
+  else if ( 'friends' == $bp->current_action )
+    $name = 'Friends';
+  else if ( 'groups' == $bp->current_action )
+    $name = 'Groups';
+  else if ( 'favorites' == $bp->current_action )
+    $name = 'Favorites';
+  else if ( 'mentions' == $bp->current_action )
+    $name = 'Mentions';
+  else if ( 'blogs' == $bp->current_action )
+    $name = 'Blogs';
+
+  return apply_filters( 'bp_get_activity_current_feed_title', $name );
+}
+ function bp_member_current_activity_feed_title() { return bp_get_member_current_activity_feed_title(); }
+ function bp_member_current_activity_rss_title() { return bp_get_member_current_activity_feed_title(); }
 
 /* Template tags for RSS feed output */
 
@@ -1071 +1091 @@
                 return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
         }
 
-?>
- No newline at end of file
+?>

wp-content/plugins/buddypress/bp-themes/bp-default/header.php

@@ -18 +18 @@
                         <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php _e('Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
                 <?php endif; ?>
 
-                <?php if ( function_exists( 'bp_member_activity_feed_link' ) && bp_is_member() ) : ?>
-                        <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( 'Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
+                <?php if ( function_exists( 'bp_member_activity_feed_link' ) && bp_is_member() && bp_is_activity_component() ) : ?>
+                        <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( bp_member_current_activity_rss_title() . ' Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
                 <?php endif; ?>
 
                 <?php if ( function_exists( 'bp_group_activity_feed_link' ) && bp_is_group() ) : ?>
@@ -108 +108 @@
                 <?php do_action( 'bp_after_header' ) ?>
                 <?php do_action( 'bp_before_container' ) ?>
 
-                <div id="container">
- No newline at end of file
+                <div id="container">