Skip to:
Content

BuddyPress.org

Ticket #1285: patch.diff

File patch.diff, 5.5 KB (added by petronic, 15 years ago)

  • bp-activity/bp-activity-classes.php

     
    157157                        $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
    158158               
    159159                if ( $limit && $page && $max_items )
    160                         $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $pag_sql", $user_id ) );
     160                        $activities = $wpdb->get_results( $wpdb->prepare( apply_filters( 'bp_activity_get_activity_for_user_sql', "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $pag_sql", $user_id, $filter_sql, $pag_sql, $max_sql), $user_id ) );
    161161                else
    162                         $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $user_id ) );
     162                        $activities = $wpdb->get_results( $wpdb->prepare( apply_filters( 'bp_activity_get_activity_for_user_sql', "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $user_id, $filter_sql, $pag_sql, $max_sql), $user_id ) );
    163163               
    164                 $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $max_sql", $user_id ) );
     164                $total_activities = $wpdb->get_var( $wpdb->prepare( apply_filters( 'bp_activity_get_activity_for_user_count', "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $max_sql", $user_id, $filter_sql, $pag_sql, $max_sql), $user_id ) );
    165165               
    166166                return array( 'activities' => $activities, 'total' => (int)$total_activities );
    167167        }
    … …  
    192192                $friend_ids = implode( ',', $friend_ids );
    193193               
    194194                if ( $limit && $page && $max_items )
    195                         $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql" ) );
     195                        $activities = $wpdb->get_results( $wpdb->prepare( apply_filters( 'bp_activity_get_activity_for_friends_sql', "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql", $user_id, $friend_ids, $filter_sql, $pag_sql, $max_sql) ) );
    196196                else
    197                         $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql" ) );                       
     197                        $activities = $wpdb->get_results( $wpdb->prepare( apply_filters( 'bp_activity_get_activity_for_friends_sql', "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $user_id, $friend_ids, $filter_sql, $pag_sql, $max_sql) ) );                   
    198198
    199                 $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $max_sql" ) );
     199                $total_activities = $wpdb->get_var( $wpdb->prepare( apply_filters( 'bp_activity_get_activity_for_friends_count', "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $max_sql", $user_id, $friend_ids, $filter_sql, $pag_sql, $max_sql) ) );
    200200               
    201201                return array( 'activities' => $activities, 'total' => (int)$total_activities );
    202202        }
    … …  
    215215                        $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
    216216
    217217                if ( $limit && $page && $max )
    218                         $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $pag_sql" ) );
     218                        $activities = $wpdb->get_results( $wpdb->prepare( apply_filters( 'bp_activity_get_sitewide_activity_sql', "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $pag_sql", $filter_sql, $pag_sql, $max_sql ) ) );
    219219                else
    220                         $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql" ) );
     220                        $activities = $wpdb->get_results( $wpdb->prepare( apply_filters( 'bp_activity_get_sitewide_activity_sql', "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $filter_sql, $pag_sql, $max_sql ) ) );
    221221
    222                 $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $max_sql" ) );
     222                $total_activities = $wpdb->get_var( $wpdb->prepare( apply_filters( 'bp_activity_get_sitewide_activity_count', "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $max_sql", $filter_sql, $pag_sql, $max_sql ) ) );
    223223
    224224                return array( 'activities' => $activities, 'total' => (int)$total_activities );
    225225        }