Changeset 1062 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

02/11/2009 08:08:26 PM (16 years ago)

Author:

apeatling

Message:

Fixes #340

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (2 diffs)

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

@@ -46 +46 @@
         global $wpdb, $bp, $current_user;
 
-        if ( !$this->item_id || !$this->user_id || $this->is_private )
+        if ( !$this->item_id || !$this->user_id || $this->is_private || !$this->component_name )
             return false;
             
@@ -161 +161 @@
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name_current_user} WHERE date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC LIMIT 30", $since ) );
 
-            for ( $i = 0; $i < count( $activities ); $i++ ) {           
+            for ( $i = 0; $i < count( $activities ); $i++ ) {
+                
+                if ( !$activities[$i]->component_name ) continue;
+                        
                 if ( function_exists( $bp->{$activities[$i]->component_name}->format_activity_function ) ) {    
                     if ( !$content = call_user_func( $bp->{$activities[$i]->component_name}->format_activity_function, $activities[$i]->item_id, $activities[$i]->user_id, $activities[$i]->component_action, $activities[$i]->secondary_item_id ) )