Changeset 5729 for trunk/bp-activity/bp-activity-classes.php
- Timestamp:
- 02/11/2012 09:32:04 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-classes.php
r5704 r5729 173 173 $activity_user_ids = array(); 174 174 if ( bp_is_active( 'xprofile' ) && $activities ) { 175 foreach ( (array) $activities as $activity ) {176 if ( (int) $activity->user_id )175 foreach ( (array) $activities as $activity ) { 176 if ( (int) $activity->user_id ) 177 177 $activity_user_ids[] = $activity->user_id; 178 178 } 179 179 180 $activity_user_ids = implode( ',', array_unique( (array) $activity_user_ids ) );180 $activity_user_ids = implode( ',', array_unique( (array) $activity_user_ids ) ); 181 181 if ( !empty( $activity_user_ids ) ) { 182 182 if ( $names = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, value AS user_fullname FROM {$bp->profile->table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})" ) ) ) { 183 foreach ( (array) $names as $name )183 foreach ( (array) $names as $name ) 184 184 $tmp_names[$name->user_id] = $name->user_fullname; 185 185 186 foreach ( (array) $activities as $i => $activity ) {186 foreach ( (array) $activities as $i => $activity ) { 187 187 if ( !empty( $tmp_names[$activity->user_id] ) ) 188 188 $activities[$i]->user_fullname = $tmp_names[$activity->user_id]; … … 197 197 // Get activity meta 198 198 $activity_ids = array(); 199 foreach ( (array) $activities as $activity ) {199 foreach ( (array) $activities as $activity ) { 200 200 $activity_ids[] = $activity->id; 201 201 } … … 210 210 // If $max is set, only return up to the max results 211 211 if ( !empty( $max ) ) { 212 if ( (int) $total_activities > (int)$max )212 if ( (int) $total_activities > (int) $max ) 213 213 $total_activities = $max; 214 214 } 215 215 216 return array( 'activities' => $activities, 'total' => (int) $total_activities );216 return array( 'activities' => $activities, 'total' => (int) $total_activities ); 217 217 } 218 218 … … 386 386 387 387 /* Now fetch the activity comments and parse them into the correct position in the activities array. */ 388 foreach( (array) $activities as $activity ) {388 foreach( (array) $activities as $activity ) { 389 389 if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right ) 390 390 $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $spam ); … … 392 392 393 393 /* Merge the comments with the activity items */ 394 foreach( (array) $activities as $key => $activity )394 foreach( (array) $activities as $key => $activity ) 395 395 if ( isset( $activity_comments[$activity->id] ) ) 396 396 $activities[$key]->children = $activity_comments[$activity->id]; … … 440 440 441 441 // Loop descendants and build an assoc array 442 foreach ( (array) $descendants as $d ) {442 foreach ( (array) $descendants as $d ) { 443 443 $d->children = array(); 444 444 … … 470 470 471 471 // Loop the descendants and recalculate the left and right values 472 foreach ( (array) $descendants as $descendant )472 foreach ( (array) $descendants as $descendant ) 473 473 $right = BP_Activity_Activity::rebuild_activity_comment_tree( $descendant->id, $right ); 474 474
Note: See TracChangeset
for help on using the changeset viewer.