<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2280] trunk/bp-activity/feeds:
Updated RSS feeds with better comment and link support.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2280</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-09 10:37:50 +0000 (Sat, 09 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated RSS feeds with better comment and link support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityfeedsbpactivityfriendsfeedphp">trunk/bp-activity/feeds/bp-activity-friends-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitygroupfeedphp">trunk/bp-activity/feeds/bp-activity-group-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitypersonalfeedphp">trunk/bp-activity/feeds/bp-activity-personal-feed.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivitysitewidefeedphp">trunk/bp-activity/feeds/bp-activity-sitewide-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 (2279 => 2280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-friends-feed.php 2010-01-09 10:05:58 UTC (rev 2279)
+++ trunk/bp-activity/feeds/bp-activity-friends-feed.php 2010-01-09 10:37:50 UTC (rev 2280)
</span><span class="lines">@@ -27,16 +27,30 @@
</span><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 if ( bp_has_activities( 'type=friends&max=50' ) ) : ?>
</del><ins>+ <?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=inline' ) ) : ?>
</ins><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><span class="cx"> <guid><?php bp_activity_thread_permalink() ?></guid>
</span><span class="cx"> <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
</span><del>- <link><?php echo bp_activity_feed_item_link() ?></link>
</del><ins>+ <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><del>- <description><![CDATA[<?php bp_activity_feed_item_description() ?>]]></description>
- <?php do_action('bp_activity_personal_feed_item'); ?>
</del><ins>+ <description>
+ <![CDATA[
+ <?php bp_activity_feed_item_description() ?>
+
+ <?php if ( bp_activity_can_comment() ) : ?>
+ <p><?php printf( __( 'Comments: %s', 'buddypress' ), bp_activity_get_comment_count() ); ?></p>
+ <?php endif; ?>
+
+ <?php if ( 'activity_comment' == bp_get_activity_action_name() ) : ?>
+ <br /><strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> -
+ <?php bp_activity_parent_content() ?>
+ <?php endif; ?>
+ ]]>
+ </description>
+ <?php do_action('bp_activity_personal_feed_item'); ?>
</ins><span class="cx"> </item>
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitygroupfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-group-feed.php (2279 => 2280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-group-feed.php 2010-01-09 10:05:58 UTC (rev 2279)
+++ trunk/bp-activity/feeds/bp-activity-group-feed.php 2010-01-09 10:37:50 UTC (rev 2280)
</span><span class="lines">@@ -27,15 +27,23 @@
</span><span class="cx"> <language><?php echo get_option('rss_language'); ?></language>
</span><span class="cx"> <?php do_action('bp_activity_group_feed_head'); ?>
</span><span class="cx">
</span><del>- <?php if ( bp_has_activities( 'object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id . '&max=50' ) ) : ?>
</del><ins>+ <?php if ( bp_has_activities( 'object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id . '&max=50&display_comments=threaded' ) ) : ?>
</ins><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><span class="cx"> <guid><?php bp_activity_thread_permalink() ?></guid>
</span><span class="cx"> <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
</span><del>- <link><?php echo bp_activity_feed_item_link() ?></link>
</del><ins>+ <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><del>- <description><![CDATA[<?php bp_activity_feed_item_description() ?>]]></description>
</del><ins>+ <description>
+ <![CDATA[
+ <?php bp_activity_feed_item_description() ?>
+
+ <?php if ( bp_activity_can_comment() ) : ?>
+ <p><?php printf( __( 'Comments: %s', 'buddypress' ), bp_activity_get_comment_count() ); ?></p>
+ <?php endif; ?>
+ ]]>
+ </description>
</ins><span class="cx"> <?php do_action('bp_activity_group_feed_item'); ?>
</span><span class="cx"> </item>
</span><span class="cx"> <?php endwhile; ?>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitypersonalfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-personal-feed.php (2279 => 2280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-personal-feed.php 2010-01-09 10:05:58 UTC (rev 2279)
+++ trunk/bp-activity/feeds/bp-activity-personal-feed.php 2010-01-09 10:37:50 UTC (rev 2280)
</span><span class="lines">@@ -27,15 +27,28 @@
</span><span class="cx"> <language><?php echo get_option('rss_language'); ?></language>
</span><span class="cx"> <?php do_action('bp_activity_personal_feed_head'); ?>
</span><span class="cx">
</span><del>- <?php if ( bp_has_activities( 'user_id=' . $bp->displayed_user->id . '&max=50' ) ) : ?>
</del><ins>+ <?php if ( bp_has_activities( 'user_id=' . $bp->displayed_user->id . '&max=50&display_comments=inline' ) ) : ?>
</ins><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><span class="cx"> <guid><?php bp_activity_thread_permalink() ?></guid>
</span><span class="cx"> <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
</span><del>- <link><?php echo bp_activity_feed_item_link() ?></link>
</del><ins>+ <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><del>- <description><![CDATA[<?php bp_activity_feed_item_description() ?>]]></description>
</del><ins>+ <description>
+ <![CDATA[
+ <?php bp_activity_feed_item_description() ?>
+
+ <?php if ( bp_activity_can_comment() ) : ?>
+ <p><?php printf( __( 'Comments: %s', 'buddypress' ), bp_activity_get_comment_count() ); ?></p>
+ <?php endif; ?>
+
+ <?php if ( 'activity_comment' == bp_get_activity_action_name() ) : ?>
+ <br /><strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> -
+ <?php bp_activity_parent_content() ?>
+ <?php endif; ?>
+ ]]>
+ </description>
</ins><span class="cx"> <?php do_action('bp_activity_personal_feed_item'); ?>
</span><span class="cx"> </item>
</span><span class="cx"> <?php endwhile; ?>
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitysitewidefeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-sitewide-feed.php (2279 => 2280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-sitewide-feed.php 2010-01-09 10:05:58 UTC (rev 2279)
+++ trunk/bp-activity/feeds/bp-activity-sitewide-feed.php 2010-01-09 10:37:50 UTC (rev 2280)
</span><span class="lines">@@ -28,12 +28,12 @@
</span><span class="cx"> <language><?php echo get_option('rss_language'); ?></language>
</span><span class="cx"> <?php do_action('bp_activity_sitewide_feed_head'); ?>
</span><span class="cx">
</span><del>- <?php if ( bp_has_activities( 'type=sitewide&max=50' ) ) : ?>
</del><ins>+ <?php if ( bp_has_activities( 'type=sitewide&max=50&display_comments=threaded' ) ) : ?>
</ins><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><span class="cx"> <guid><?php bp_activity_thread_permalink() ?></guid>
</span><span class="cx"> <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
</span><del>- <link><?php bp_activity_feed_item_link() ?></link>
</del><ins>+ <link><?php 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></pre>
</div>
</div>
</body>
</html>