<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5065] trunk/bp-activity/feeds/bp-activity-friends-feed.php: Update bp-activity-friends-feed.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5065">5065</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-08-30 06:43:21 +0000 (Tue, 30 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update bp-activity-friends-feed.php. Props r-a-y for original patch. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3527">#3527</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityfeedsbpactivityfriendsfeedphp">trunk/bp-activity/feeds/bp-activity-friends-feed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityfeedsbpactivityfriendsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-friends-feed.php (5064 => 5065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-friends-feed.php 2011-08-30 06:30:57 UTC (rev 5064)
+++ trunk/bp-activity/feeds/bp-activity-friends-feed.php 2011-08-30 06:43:21 UTC (rev 5065)
</span><span class="lines">@@ -22,35 +22,34 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
</del><ins>+ <title><?php bp_site_name() ?> | <?php bp_displayed_user_fullname(); ?> | <?php _e( 'Friends Activity', 'buddypress' ); ?></title>
</ins><span class="cx"> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
</span><del>- <link><?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/my-friends/feed' ?></link>
- <description><?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), $bp->displayed_user->fullname ) ?></description>
</del><ins>+ <link><?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed'; ?></link>
+ <description><?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), bp_get_displayed_user_fullname() ); ?></description>
</ins><span class="cx"> <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?></pubDate>
</span><del>- <generator>http://buddypress.org/?v=<?php echo BP_VERSION ?></generator>
</del><ins>+ <generator>http://buddypress.org/?v=<?php echo BP_VERSION; ?></generator>
</ins><span class="cx"> <language><?php echo get_option('rss_language'); ?></language>
</span><span class="cx"> <?php do_action('bp_activity_friends_feed_head'); ?>
</span><span class="cx">
</span><del>- <?php $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->displayed_user->id ) ); ?>
- <?php if ( bp_has_activities( 'user_id=' . $friend_ids . '&max=50&display_comments=stream' ) ) : ?>
</del><ins>+ <?php if ( bp_has_activities( 'scope=friends&max=50&display_comments=stream' ) ) : ?>
</ins><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><del>- <guid><?php bp_activity_thread_permalink() ?></guid>
- <title><?php bp_activity_feed_item_title() ?></title>
- <link><?php echo bp_activity_thread_permalink() ?></link>
</del><ins>+ <guid><?php bp_activity_thread_permalink(); ?></guid>
+ <title><?php bp_activity_feed_item_title(); ?></title>
+ <link><?php echo bp_activity_thread_permalink(); ?></link>
</ins><span class="cx"> <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_get_activity_feed_item_date(), false); ?></pubDate>
</span><span class="cx">
</span><span class="cx"> <description>
</span><span class="cx"> <![CDATA[
</span><del>- <?php bp_activity_feed_item_description() ?>
</del><ins>+ <?php bp_activity_feed_item_description(); ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_activity_can_comment() ) : ?>
</span><span class="cx"> <p><?php printf( __( 'Comments: %s', 'buddypress' ), bp_activity_get_comment_count() ); ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( 'activity_comment' == bp_get_activity_action_name() ) : ?>
</span><del>- <br /><strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> -
- <?php bp_activity_parent_content() ?>
</del><ins>+ <br /><strong><?php _e( 'In reply to', 'buddypress' ); ?></strong> -
+ <?php bp_activity_parent_content(); ?>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> ]]>
</span><span class="cx"> </description>
</span></span></pre>
</div>
</div>
</body>
</html>