Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
03/26/2009 02:40:04 PM (17 years ago)
Author:
apeatling
Message:

Modified the bp-activity DB structure to convert user tables to global tables. Overall for friend activity lists this is much faster and more manageable. Existing user activity will be copied to the new tables and the user tables will be dropped. This may cause a slight delay on first load.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity/bp-activity-templatetags.php

    r1238 r1265  
    11<?php
    22
    3 class BP_Activity_Template {
     3class BP_Activity_User_Activity_Template {
    44    var $current_activity = -1;
    55    var $activity_count;
    … …  
    2020    var $is_home;
    2121   
    22     function bp_activity_template( $user_id = false, $limit = false, $filter_content = true ) {
     22    function bp_activity_user_activity_template( $user_id = false, $limit = false, $filter_content = true ) {
    2323        global $bp;
    2424       
    … …  
    3131            $this->activities = BP_Activity_Activity::get_activity_for_friends( $user_id, $limit );
    3232        }
    33 
    34         $this->activity_count = count($this->activities);
     33       
     34        if ( !$this->activities )
     35            $this->activity_count = false;
     36        else
     37            $this->activity_count = count($this->activities);
     38       
    3539        $this->full_name = $bp->displayed_user->fullname;
    3640
    … …  
    7882        $this->in_the_loop = true;
    7983        $this->activity = $this->next_activity();
     84       
     85        if ( is_array( $this->activity ) )
     86            $this->activity = (object) $this->activity;
    8087
    8188        if ( $this->current_activity == 0 ) // loop has just started
    … …  
    109116        $bp_activity_limit = 35;
    110117       
    111     $activities_template = new BP_Activity_Template( $bp_activity_user_id, $bp_activity_limit, $filter_content );       
     118    $activities_template = new BP_Activity_User_Activity_Template( $bp_activity_user_id, $bp_activity_limit, $filter_content );     
     119
    112120    return $activities_template->has_activities();
    113121}
    … …  
    125133function bp_activities_title() {
    126134    global $bp_activity_title;
     135   
    127136    echo apply_filters( 'bp_activities_title', $bp_activity_title );
    128137}
    … …  
    138147    if ( $activities_template->filter_content ) {
    139148        if ( $activities_template->is_home ) {
    140             echo apply_filters( 'bp_activity_content', bp_activity_content_filter( $activities_template->activity['content'], $activities_template->activity['date_recorded'], $activities_template->full_name ) );                     
     149            echo apply_filters( 'bp_activity_content', bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name ) );                     
    141150        } else {
    142             echo apply_filters( 'bp_activity_content', bp_activity_content_filter( $activities_template->activity['content'], $activities_template->activity['date_recorded'], $activities_template->full_name, true, false, false ) );                                 
     151            echo apply_filters( 'bp_activity_content', bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name, true, false, false ) );                                 
    143152        }
    144153    } else {
    145         $activities_template->activity['content'] = bp_activity_insert_time_since( $activities_template->activity['content'], $activities_template->activity['date_recorded'] );
    146         echo apply_filters( 'bp_activity_content', $activities_template->activity['content'] );
     154        $activities_template->activity->content = bp_activity_insert_time_since( $activities_template->activity->content, $activities_template->activity->date_recorded );
     155        echo apply_filters( 'bp_activity_content', $activities_template->activity->content );
    147156    }
    148157}
    … …  
    196205function bp_activity_css_class() {
    197206    global $activities_template;
    198     echo apply_filters( 'bp_activity_css_class', $activities_template->activity['component_name'] );
     207    echo apply_filters( 'bp_activity_css_class', $activities_template->activity->component_name );
    199208}
    200209
    … …  
    219228    global $activities_template;
    220229
    221     $title = explode( '<span', $activities_template->activity['content'] );
     230    $title = explode( '<span', $activities_template->activity->content );
    222231    echo apply_filters( 'bp_activity_feed_item_title', trim( strip_tags( html_entity_decode( $title[0] ) ) ) );
    223232}
    … …  
    226235    global $activities_template;
    227236
    228     echo apply_filters( 'bp_activity_feed_item_link', $activities_template->activity['primary_link'] );
     237    echo apply_filters( 'bp_activity_feed_item_link', $activities_template->activity->primary_link );
    229238}
    230239
    … …  
    232241    global $activities_template;
    233242
    234     echo apply_filters( 'bp_activity_feed_item_date', $activities_template->activity['date_recorded'] );
     243    echo apply_filters( 'bp_activity_feed_item_date', $activities_template->activity->date_recorded );
    235244}
    236245
    … …  
    238247    global $activities_template;
    239248
    240     echo apply_filters( 'bp_activity_feed_item_description', sprintf( html_entity_decode( $activities_template->activity['content'], '' ) ) ); 
     249    echo apply_filters( 'bp_activity_feed_item_description', sprintf( html_entity_decode( $activities_template->activity->content, '' ) ) );   
    241250}
    242251
Note: See TracChangeset for help on using the changeset viewer.