Changeset 2356

Timestamp:

01/19/2010 02:06:25 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1582 - missing activity favorites RSS feed.

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-activity/bp-activity-classes.php (modified) (3 diffs)
• bp-activity/feeds/bp-activity-favorites-feed.php (added)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-activity.php

@@ -370 +370 @@
 add_action( 'wp', 'bp_activity_action_mentions_feed', 3 );
 
+function bp_activity_action_favorites_feed() {
+        global $bp, $wp_query;
+
+        if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'favorites' || $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' );
+        die;
+}
+add_action( 'wp', 'bp_activity_action_favorites_feed', 3 );
 
 /********************************************************************************
@@ -691 +704 @@
 
 function bp_activity_get_user_favorites( $user_id ) {
-        global $bp;
-
         $my_favs = maybe_unserialize( get_usermeta( $user_id, 'bp_favorite_activities' ) );
         $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) );

trunk/bp-activity/bp-activity-classes.php

@@ -218 +218 @@
                         $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
 
-                if ( $max )
-                        $max_sql = $wpdb->prepare( "LIMIT %d", $max );
-
                 /* Searching */
                 if ( $search_terms ) {
@@ -249 +246 @@
                         $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
                 else
-                        $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql} {$max_sql}" ) );
-
-                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$max_sql}" ) );
+                        $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
+
+                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}" ) );
 
                 if ( $activities && $display_comments )
                         $activities = BP_Activity_Activity::append_comments( &$activities );
 
+                /* If $max is set, only return up to the max results */
+                if ( (int)$total_activities > (int)$max )
+                        $total_activities = $max;
+
                 return array( 'activities' => $activities, 'total' => (int)$total_activities );
         }
@@ -270 +271 @@
                         $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
 
-                if ( $max )
-                        $max_sql = $wpdb->prepare( "LIMIT %d", $max );
-
                 if ( $sort != 'ASC' && $sort != 'DESC' )
                         $sort = 'DESC';
 
-                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql $max_sql" ) );
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql" ) );
                 $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids})" ) );
 
                 if ( $display_comments )
                         $activities = BP_Activity_Activity::append_comments( $activities );
+
+                /* If $max is set, only return up to the max results */
+                if ( !empty( $max ) ) {
+                        if ( (int)$total_activities > (int)$max )
+                                $total_activities = $max;
+                }
 
                 return array( 'activities' => $activities, 'total' => (int)$total_activities );

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -194 +194 @@
                                         $favorite_ids = implode( ',', (array)$favs );
                                         $query_string = 'include=' . $favorite_ids;
-                                        $feed_url = $bp->loggedin_user->domain  . BP_ACTIVITY_SLUG . '/my-favorites/feed/';
+                                        $feed_url = $bp->loggedin_user->domain  . BP_ACTIVITY_SLUG . '/favorites/feed/';
                                         break;
                                 case 'atme':