<!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] [2270] trunk: Updated RSS feed support in default theme.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2270</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-06 16:04:58 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated RSS feed support in default theme.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivityfriendsfeedphp">trunk/bp-activity/feeds/bp-activity-friends-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>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleactivityphp">trunk/bp-themes/bp-default/groups/single/activity.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleactivityphp">trunk/bp-themes/bp-default/members/single/activity.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpactivityfeedsbpactivitygroupfeedphp">trunk/bp-activity/feeds/bp-activity-group-feed.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incimagesrsspng">trunk/bp-themes/bp-default/_inc/images/rss.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-activity/bp-activity-filters.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -4,9 +4,11 @@
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'bp_activity_filter_kses', 1 );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'bp_activity_filter_kses', 1 );
</span><ins>+add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_filter_kses', 1 );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'force_balance_tags' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'force_balance_tags' );
</span><ins>+add_filter( 'bp_get_activity_feed_item_description', 'force_balance_tags' );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'wptexturize' );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'wptexturize' );
</span><span class="lines">@@ -21,14 +23,17 @@
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'convert_chars' );
</span><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'wpautop' );
</span><ins>+add_filter( 'bp_get_activity_feed_item_description', 'wpautop' );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'make_clickable' );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'make_clickable' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'make_clickable' );
</span><ins>+add_filter( 'bp_get_activity_feed_item_description', 'make_clickable' );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'stripslashes_deep' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'stripslashes_deep' );
</span><ins>+add_filter( 'bp_get_activity_feed_item_description', 'stripslashes_deep' );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'bp_create_excerpt' );
</span><span class="cx">
</span><span class="lines">@@ -79,5 +84,6 @@
</span><span class="cx"> add_filter( 'xprofile_activity_new_update_content', 'bp_activity_at_name_filter' );
</span><span class="cx"> add_filter( 'groups_activity_new_update_content', 'bp_activity_at_name_filter' );
</span><span class="cx"> add_filter( 'bp_activity_comment_content', 'bp_activity_at_name_filter' );
</span><ins>+add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_at_name_filter' );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -668,21 +668,25 @@
</span><span class="cx"> function bp_get_sitewide_activity_feed_link() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_sitewide_activity_feed_link', site_url( $bp->activity->slug . '/feed' ) );
</del><ins>+ return apply_filters( 'bp_get_sitewide_activity_feed_link', site_url( $bp->activity->slug . '/feed/' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_activities_member_rss_link() {
- echo bp_get_activities_member_rss_link();
</del><ins>+function bp_member_activity_feed_link() {
+ echo bp_get_member_activity_feed_link();
</ins><span class="cx"> }
</span><del>- function bp_get_activities_member_rss_link() {
</del><ins>+function bp_activities_member_rss_link() { echo bp_get_member_activity_feed_link(); }
+
+ function bp_get_member_activity_feed_link() {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( ( $bp->current_component == $bp->profile->slug ) || 'just-me' == $bp->current_action )
</span><del>- return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed' );
</del><ins>+ return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed/' );
</ins><span class="cx"> else
</span><del>- return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' );
</del><ins>+ return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed/' );
</ins><span class="cx"> }
</span><ins>+ function bp_get_activities_member_rss_link() { return bp_get_member_activity_feed_link(); }
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> /* Template tags for RSS feed output */
</span><span class="cx">
</span><span class="cx"> function bp_activity_feed_item_guid() {
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivityfriendsfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-friends-feed.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-friends-feed.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-activity/feeds/bp-activity-friends-feed.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * RSS2 Feed Template for displaying the site wide activity stream.
</del><ins>+ * RSS2 Feed Template for displaying a member's friends activity stream.
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> */
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> <generator>http://buddypress.org/?v=<?php echo BP_VERSION ?></generator>
</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><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( bp_has_activities( 'type=friends&max=50' ) ) : ?>
</span><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><del>- <guid><?php bp_activity_feed_item_guid() ?></guid>
</del><ins>+ <guid><?php bp_activity_thread_permalink() ?></guid>
</ins><span class="cx"> <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
</span><span class="cx"> <link><?php echo bp_activity_feed_item_link() ?></link>
</span><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></pre></div>
<a id="trunkbpactivityfeedsbpactivitygroupfeedphp"></a>
<div class="addfile"><h4>Added: trunk/bp-activity/feeds/bp-activity-group-feed.php (0 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-group-feed.php (rev 0)
+++ trunk/bp-activity/feeds/bp-activity-group-feed.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<?php
+/**
+ * RSS2 Feed Template for displaying a group activity stream
+ *
+ * @package BuddyPress
+ */
+header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+header('Status: 200 OK');
+?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+
+<rss version="2.0"
+ xmlns:content="http://purl.org/rss/1.0/modules/content/"
+ xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:atom="http://www.w3.org/2005/Atom"
+ <?php do_action('bp_activity_group_feed'); ?>
+>
+
+<channel>
+ <title><?php echo $bp->groups->current_group->name ?> - <?php _e( 'Group Activity', 'buddypress' ) ?></title>
+ <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
+ <link><?php echo bp_get_group_permalink( $bp->groups->current_group ) . $bp->activity->slug . '/feed' ?></link>
+ <description><?php printf( __( '%s - Group Activity Feed', 'buddypress' ), $bp->groups->current_group->name ) ?></description>
+ <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?></pubDate>
+ <generator>http://buddypress.org/?v=<?php echo BP_VERSION ?></generator>
+ <language><?php echo get_option('rss_language'); ?></language>
+ <?php do_action('bp_activity_group_feed_head'); ?>
+
+ <?php if ( bp_has_activities( 'object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id . '&max=50' ) ) : ?>
+ <?php while ( bp_activities() ) : bp_the_activity(); ?>
+ <item>
+ <guid><?php bp_activity_thread_permalink() ?></guid>
+ <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
+ <link><?php echo bp_activity_feed_item_link() ?></link>
+ <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_get_activity_feed_item_date(), false); ?></pubDate>
+
+ <description><![CDATA[<?php bp_activity_feed_item_description() ?>]]></description>
+ <?php do_action('bp_activity_group_feed_item'); ?>
+ </item>
+ <?php endwhile; ?>
+
+ <?php endif; ?>
+</channel>
+</rss>
</ins></span></pre></div>
<a id="trunkbpactivityfeedsbpactivitypersonalfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-personal-feed.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-personal-feed.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-activity/feeds/bp-activity-personal-feed.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * RSS2 Feed Template for displaying the site wide activity stream.
</del><ins>+ * RSS2 Feed Template for displaying a member's activity stream.
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> */
</span><span class="lines">@@ -26,17 +26,17 @@
</span><span class="cx"> <generator>http://buddypress.org/?v=<?php echo BP_VERSION ?></generator>
</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><del>-
- <?php if ( bp_has_activities( 'type=personal&max=50' ) ) : ?>
</del><ins>+
+ <?php if ( bp_has_activities( 'user_id=' . $bp->displayed_user->id . '&max=50' ) ) : ?>
</ins><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><del>- <guid><?php bp_activity_feed_item_guid() ?></guid>
</del><ins>+ <guid><?php bp_activity_thread_permalink() ?></guid>
</ins><span class="cx"> <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
</span><span class="cx"> <link><?php echo bp_activity_feed_item_link() ?></link>
</span><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><![CDATA[<?php bp_activity_feed_item_description() ?>]]></description>
</span><del>- <?php do_action('bp_activity_personal_feed_item'); ?>
</del><ins>+ <?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="trunkbpactivityfeedsbpactivitysitewidefeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-sitewide-feed.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-sitewide-feed.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-activity/feeds/bp-activity-sitewide-feed.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -27,16 +27,24 @@
</span><span class="cx"> <generator>http://buddypress.org/?v=<?php echo BP_VERSION ?></generator>
</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><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( bp_has_activities( 'type=sitewide&max=50' ) ) : ?>
</span><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <item>
</span><del>- <guid><?php bp_activity_feed_item_guid() ?></guid>
</del><ins>+ <guid><?php bp_activity_thread_permalink() ?></guid>
</ins><span class="cx"> <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
</span><span class="cx"> <link><?php bp_activity_feed_item_link() ?></link>
</span><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_personal_feed_item'); ?>
</span><span class="cx"> </item>
</span><span class="cx"> <?php endwhile; ?>
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-activity.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> function bp_activity_action_sitewide_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( $bp->current_component != $bp->activity->slug || $bp->current_action != 'feed' || $bp->displayed_user->id )
</del><ins>+ if ( $bp->current_component != $bp->activity->slug || $bp->current_action != 'feed' || $bp->displayed_user->id || $bp->groups->current_group )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="lines">@@ -340,7 +340,6 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp', 'bp_activity_action_friends_feed', 3 );
</span><span class="cx">
</span><del>-
</del><span class="cx"> /********************************************************************************
</span><span class="cx"> * Business Functions
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -2178,4 +2178,26 @@
</span><span class="cx"> return wp_nonce_url( site_url( BP_GROUPS_SLUG . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/***
+ * Groups RSS Feed Template Tags
+ */
+
+function bp_group_activity_feed_link() {
+ echo bp_get_group_activity_feed_link();
+}
+ function bp_get_group_activity_feed_link() {
+ global $bp;
+
+ return apply_filters( 'bp_get_group_activity_feed_link', bp_get_group_permalink( $bp->groups->current_group ) . 'feed/' );
+ }
+
+function bp_current_group_name() {
+ echo bp_get_current_group_name();
+}
+ function bp_get_current_group_name() {
+ global $bp;
+
+ $name = apply_filters( 'bp_get_group_name', $bp->groups->current_group->name );
+ return apply_filters( 'bp_get_current_group_name', $name );
+ }
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-groups.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -1349,7 +1349,26 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp', 'groups_action_redirect_to_random_group', 6 );
</span><span class="cx">
</span><ins>+function groups_action_groups_feed() {
+ global $bp, $wp_query;
</ins><span class="cx">
</span><ins>+ if ( $bp->current_component != $bp->groups->slug || !$bp->groups->current_group || $bp->current_action != 'feed' )
+ return false;
+
+ $wp_query->is_404 = false;
+ status_header( 200 );
+
+ if ( 'public' != $bp->groups->current_group->status ) {
+ if ( !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+ return false;
+ }
+
+ include_once( 'bp-activity/feeds/bp-activity-group-feed.php' );
+ die;
+}
+add_action( 'wp', 'groups_action_groups_feed', 3 );
+
+
</ins><span class="cx"> /********************************************************************************
</span><span class="cx"> * Activity & Notification Functions
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -501,6 +501,11 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ div.item-list-tabs ul li.feed a {
+ background: url( ../images/rss.png ) center left no-repeat;
+ padding-left: 20px;
+ }
+
</ins><span class="cx"> /* > Item Body
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incimagesrsspng"></a>
<div class="binary"><h4>Added: trunk/bp-themes/bp-default/_inc/images/rss.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/bp-themes/bp-default/_inc/images/rss.png
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:executable
</span><span class="cx"> + *
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="trunkbpthemesbpdefaultgroupssingleactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/activity.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/activity.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-themes/bp-default/groups/single/activity.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -1,13 +1,18 @@
</span><del>-<div class="item-list-tabs" id="user-subnav">
</del><ins>+<div class="item-list-tabs no-ajax" id="user-subnav">
</ins><span class="cx"> <ul>
</span><ins>+ <li class="feed"><a href="<?php bp_group_activity_feed_link() ?>" title="RSS Feed"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
+
+ <?php do_action('bp_activity_group_syndication_options') ?>
+
</ins><span class="cx"> <li id="activity-filter-select" class="last">
</span><span class="cx"> <select>
</span><span class="cx"> <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
</span><del>- <option value="new_wire_post"><?php _e( 'Updates Only', 'buddypress' ) ?></option>
- <option value="new_forum_post,new_forum_topic"><?php _e( 'Group Forum Activity Only', 'buddypress' ) ?></option>
- <option value="new_blog_post,new_blog_comment"><?php _e( 'Blog Activity Only', 'buddypress' ) ?></option>
</del><ins>+ <option value="new_wire_post"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
+ <option value="new_forum_topic"><?php _e( 'Show New Forum Topics', 'buddypress' ) ?></option>
+ <option value="new_forum_post"><?php _e( 'Show Forum Replies', 'buddypress' ) ?></option>
+ <option value="joined_group"><?php _e( 'Show New Group Memberships', 'buddypress' ) ?></option>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_activity_filter_options' ) ?>
</del><ins>+ <?php do_action( 'bp_activity_group_filter_options' ) ?>
</ins><span class="cx"> </select>
</span><span class="cx"> </li>
</span><span class="cx"> </ul>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-themes/bp-default/header.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -15,9 +15,17 @@
</span><span class="cx"> <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
</span><span class="cx">
</span><span class="cx"> <?php if ( function_exists( 'bp_sitewide_activity_feed_link' ) ) : ?>
</span><del>- <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() ?>" />
</del><ins>+ <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() ?>" />
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><ins>+ <?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 endif; ?>
+
+ <?php if ( function_exists( 'bp_group_activity_feed_link' ) && bp_is_group() ) : ?>
+ <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php bp_current_group_name() ?> | <?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_group_activity_feed_link() ?>" />
+ <?php endif; ?>
+
</ins><span class="cx"> <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> <?php _e( 'Blog Posts RSS Feed', 'buddypress' ) ?>" href="<?php bloginfo('rss2_url'); ?>" />
</span><span class="cx"> <link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name'); ?> <?php _e( 'Blog Posts Atom Feed', 'buddypress' ) ?>" href="<?php bloginfo('atom_url'); ?>" />
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/activity.php (2269 => 2270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/activity.php 2010-01-06 14:11:07 UTC (rev 2269)
+++ trunk/bp-themes/bp-default/members/single/activity.php 2010-01-06 16:04:58 UTC (rev 2270)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><del>-<div class="item-list-tabs" id="user-subnav">
</del><ins>+<div class="item-list-tabs no-ajax" id="user-subnav">
</ins><span class="cx"> <ul>
</span><ins>+ <li class="feed"><a href="<?php bp_activities_member_rss_link() ?>" title="RSS Feed"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
+
+ <?php do_action('bp_activity_member_syndication_options') ?>
+
</ins><span class="cx"> <li id="activity-filter-select" class="last">
</span><span class="cx"> <select>
</span><span class="cx"> <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
</span></span></pre>
</div>
</div>
</body>
</html>