<!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][4145] trunk/bp-activity: Fixes activity RSS feeds.</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>4145</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-03-23 19:01:52 +0000 (Wed, 23 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes activity RSS feeds. Fixes #3121</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityactionsphp">trunk/bp-activity/bp-activity-actions.php</a></li>
<li><a href="#trunkbpactivityfeedsbpactivityfavoritesfeedphp">trunk/bp-activity/feeds/bp-activity-favorites-feed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-actions.php (4144 => 4145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-actions.php 2011-03-15 14:55:33 UTC (rev 4144)
+++ trunk/bp-activity/bp-activity-actions.php 2011-03-23 19:01:52 UTC (rev 4145)
</span><span class="lines">@@ -218,14 +218,14 @@
</span><span class="cx">
</span><span class="cx"> function bp_activity_action_sitewide_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><del>-
- if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'feed' ) || bp_is_user() || isset( $bp->groups->current_group ) )
</del><ins>+
+ if ( !bp_is_current_component( 'activity' ) || !bp_is_current_action( 'feed' ) || bp_is_user() || !empty( $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="cx"> status_header( 200 );
</span><span class="cx">
</span><del>- include_once( 'bp-activity/feeds/bp-activity-sitewide-feed.php' );
</del><ins>+ include_once( 'feeds/bp-activity-sitewide-feed.php' );
</ins><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_sitewide_feed' );
</span><span class="lines">@@ -233,13 +233,13 @@
</span><span class="cx"> function bp_activity_action_personal_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( 'feed' ) )
</del><ins>+ if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'feed' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="cx"> status_header( 200 );
</span><span class="cx">
</span><del>- include_once( 'bp-activity/feeds/bp-activity-personal-feed.php' );
</del><ins>+ include_once( 'feeds/bp-activity-personal-feed.php' );
</ins><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_personal_feed' );
</span><span class="lines">@@ -247,13 +247,13 @@
</span><span class="cx"> function bp_activity_action_friends_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( !bp_is_active( 'friends' ) || $bp->activity->slug != bp_current_component() || !bp_is_user() || !bp_is_current_action( $bp->friends->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_active( 'friends' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( $bp->friends->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="cx"> status_header( 200 );
</span><span class="cx">
</span><del>- include_once( 'bp-activity/feeds/bp-activity-friends-feed.php' );
</del><ins>+ include_once( 'feeds/bp-activity-friends-feed.php' );
</ins><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_friends_feed' );
</span><span class="lines">@@ -261,13 +261,13 @@
</span><span class="cx"> function bp_activity_action_my_groups_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( !bp_is_active( 'groups' ) || $bp->activity->slug != bp_current_component() || !bp_is_user() || !bp_is_current_action( $bp->groups->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_active( 'groups' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( $bp->groups->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="cx"> status_header( 200 );
</span><span class="cx">
</span><del>- include_once( 'bp-activity/feeds/bp-activity-mygroups-feed.php' );
</del><ins>+ include_once( 'feeds/bp-activity-mygroups-feed.php' );
</ins><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_my_groups_feed' );
</span><span class="lines">@@ -275,13 +275,13 @@
</span><span class="cx"> function bp_activity_action_mentions_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="cx"> status_header( 200 );
</span><span class="cx">
</span><del>- include_once( 'bp-activity/feeds/bp-activity-mentions-feed.php' );
</del><ins>+ include_once( 'feeds/bp-activity-mentions-feed.php' );
</ins><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_mentions_feed' );
</span><span class="lines">@@ -289,13 +289,13 @@
</span><span class="cx"> function bp_activity_action_favorites_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="cx"> status_header( 200 );
</span><span class="cx">
</span><del>- include_once( 'bp-activity/feeds/bp-activity-favorites-feed.php' );
</del><ins>+ include_once( 'feeds/bp-activity-favorites-feed.php' );
</ins><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_favorites_feed' );
</span></span></pre></div>
<a id="trunkbpactivityfeedsbpactivityfavoritesfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/feeds/bp-activity-favorites-feed.php (4144 => 4145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/feeds/bp-activity-favorites-feed.php 2011-03-15 14:55:33 UTC (rev 4144)
+++ trunk/bp-activity/feeds/bp-activity-favorites-feed.php 2011-03-23 19:01:52 UTC (rev 4145)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> header('Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
</span><span class="cx"> header('Status: 200 OK');
</span><span class="cx"> ?>
</span><del>-
</del><span class="cx"> <?php echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?'.'>'; ?>
</span><span class="cx">
</span><span class="cx"> <rss version="2.0"
</span></span></pre>
</div>
</div>
</body>
</html>