Skip to:
Content

BuddyPress.org

Changeset 5065


Ignore:
Timestamp:
08/30/2011 06:43:21 AM (13 years ago)
Author:
johnjamesjacoby
Message:

Update bp-activity-friends-feed.php. Props r-a-y for original patch. Fixes #3527.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity/feeds/bp-activity-friends-feed.php

    r4817 r5065  
    2323
    2424<channel>
    25     <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
     25    <title><?php bp_site_name() ?> | <?php bp_displayed_user_fullname(); ?> | <?php _e( 'Friends Activity', 'buddypress' ); ?></title>
    2626    <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    27     <link><?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/my-friends/feed' ?></link>
    28     <description><?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), $bp->displayed_user->fullname ) ?></description>
     27    <link><?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed'; ?></link>
     28    <description><?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), bp_get_displayed_user_fullname() ); ?></description>
    2929    <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?></pubDate>
    30     <generator>http://buddypress.org/?v=<?php echo BP_VERSION ?></generator>
     30    <generator>http://buddypress.org/?v=<?php echo BP_VERSION; ?></generator>
    3131    <language><?php echo get_option('rss_language'); ?></language>
    3232    <?php do_action('bp_activity_friends_feed_head'); ?>
    3333
    34     <?php $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->displayed_user->id ) ); ?>
    35     <?php if ( bp_has_activities( 'user_id=' . $friend_ids . '&max=50&display_comments=stream' ) ) : ?>
     34    <?php if ( bp_has_activities( 'scope=friends&max=50&display_comments=stream' ) ) : ?>
    3635        <?php while ( bp_activities() ) : bp_the_activity(); ?>
    3736            <item>
    38                 <guid><?php bp_activity_thread_permalink() ?></guid>
    39                 <title><?php bp_activity_feed_item_title() ?></title>
    40                 <link><?php echo bp_activity_thread_permalink() ?></link>
     37                <guid><?php bp_activity_thread_permalink(); ?></guid>
     38                <title><?php bp_activity_feed_item_title(); ?></title>
     39                <link><?php echo bp_activity_thread_permalink(); ?></link>
    4140                <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_get_activity_feed_item_date(), false); ?></pubDate>
    4241
    4342                <description>
    4443                    <![CDATA[
    45                     <?php bp_activity_feed_item_description() ?>
     44                    <?php bp_activity_feed_item_description(); ?>
    4645
    4746                    <?php if ( bp_activity_can_comment() ) : ?>
     
    5049
    5150                    <?php if ( 'activity_comment' == bp_get_activity_action_name() ) : ?>
    52                         <br /><strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> -
    53                         <?php bp_activity_parent_content() ?>
     51                        <br /><strong><?php _e( 'In reply to', 'buddypress' ); ?></strong> -
     52                        <?php bp_activity_parent_content(); ?>
    5453                    <?php endif; ?>
    5554                    ]]>
Note: See TracChangeset for help on using the changeset viewer.