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

Timestamp:

02/03/2010 09:06:27 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1551 - also safeguarded all foreach loops with an array typecast.

File:

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

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

@@ -319 +319 @@
 
         /* Now fetch the activity comments and parse them into the correct position in the activities array. */
-        foreach( $activities as $activity ) {
+        foreach( (array)$activities as $activity ) {
             if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right )
                 $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right );
@@ -325 +325 @@
 
         /* Merge the comments with the activity items */
-        foreach( $activities as $key => $activity )
+        foreach( (array)$activities as $key => $activity )
             $activities[$key]->children = $activity_comments[$activity->id];
 
@@ -345 +345 @@
 
         /* Loop descendants and build an assoc array */
-        foreach ( $descendants as $d ) {
+        foreach ( (array)$descendants as $d ) {
             $d->children = array();
 
@@ -373 +373 @@
 
         /* Loop the descendants and recalculate the left and right values */
-        foreach ( $descendants as $descendant )
+        foreach ( (array)$descendants as $descendant )
             $right = BP_Activity_Activity::rebuild_activity_comment_tree( $descendant->id, $right );