Changeset 4145 for trunk/bp-activity/bp-activity-actions.php

Timestamp:

03/23/2011 07:01:52 PM (14 years ago)

Author:

boonebgorges

Message:

Fixes activity RSS feeds. Fixes #3121

File:

• trunk/bp-activity/bp-activity-actions.php (modified) (6 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -219 +219 @@
 function bp_activity_action_sitewide_feed() {
     global $bp, $wp_query;
-
-    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'feed' ) || bp_is_user() || isset( $bp->groups->current_group ) )
-        return false;
-
-    $wp_query->is_404 = false;
-    status_header( 200 );
-
-    include_once( 'bp-activity/feeds/bp-activity-sitewide-feed.php' );
+    
+    if ( !bp_is_current_component( 'activity' ) || !bp_is_current_action( 'feed' ) || bp_is_user() || !empty( $bp->groups->current_group ) )
+        return false;
+
+    $wp_query->is_404 = false;
+    status_header( 200 );
+
+    include_once( 'feeds/bp-activity-sitewide-feed.php' );
     die;
 }
@@ -234 +234 @@
     global $bp, $wp_query;
 
-    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( 'feed' ) )
-        return false;
-
-    $wp_query->is_404 = false;
-    status_header( 200 );
-
-    include_once( 'bp-activity/feeds/bp-activity-personal-feed.php' );
+    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'feed' ) )
+        return false;
+
+    $wp_query->is_404 = false;
+    status_header( 200 );
+
+    include_once( 'feeds/bp-activity-personal-feed.php' );
     die;
 }
@@ -248 +248 @@
     global $bp, $wp_query;
 
-    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' )
-        return false;
-
-    $wp_query->is_404 = false;
-    status_header( 200 );
-
-    include_once( 'bp-activity/feeds/bp-activity-friends-feed.php' );
+    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' )
+        return false;
+
+    $wp_query->is_404 = false;
+    status_header( 200 );
+
+    include_once( 'feeds/bp-activity-friends-feed.php' );
     die;
 }
@@ -262 +262 @@
     global $bp, $wp_query;
 
-    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' )
-        return false;
-
-    $wp_query->is_404 = false;
-    status_header( 200 );
-
-    include_once( 'bp-activity/feeds/bp-activity-mygroups-feed.php' );
+    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' )
+        return false;
+
+    $wp_query->is_404 = false;
+    status_header( 200 );
+
+    include_once( 'feeds/bp-activity-mygroups-feed.php' );
     die;
 }
@@ -276 +276 @@
     global $bp, $wp_query;
 
-    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' )
-        return false;
-
-    $wp_query->is_404 = false;
-    status_header( 200 );
-
-    include_once( 'bp-activity/feeds/bp-activity-mentions-feed.php' );
+    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+        return false;
+
+    $wp_query->is_404 = false;
+    status_header( 200 );
+
+    include_once( 'feeds/bp-activity-mentions-feed.php' );
     die;
 }
@@ -290 +290 @@
     global $bp, $wp_query;
 
-    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' )
-        return false;
-
-    $wp_query->is_404 = false;
-    status_header( 200 );
-
-    include_once( 'bp-activity/feeds/bp-activity-favorites-feed.php' );
+    if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+        return false;
+
+    $wp_query->is_404 = false;
+    status_header( 200 );
+
+    include_once( 'feeds/bp-activity-favorites-feed.php' );
     die;
 }