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

Timestamp:

11/06/2010 07:04:00 PM (16 years ago)

Author:

djpaul

Message:

Fixes quite a lot more WP_DEBUG warnings.

File:

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

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

@@ -179 +179 @@
                         return false;
 
+                $pag_sql = '';
                 if ( $per_page && $page )
                         $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
@@ -337 +338 @@
                 global $bp, $wpdb;
 
+                $activity_comments = array();
+
                 /* Now fetch the activity comments and parse them into the correct position in the activities array. */
                 foreach( (array)$activities as $activity ) {
@@ -345 +348 @@
                 /* Merge the comments with the activity items */
                 foreach( (array)$activities as $key => $activity )
-                        $activities[$key]->children = $activity_comments[$activity->id];
+                        if ( isset( $activity_comments[$activity->id] ) )
+                                $activities[$key]->children = $activity_comments[$activity->id];
 
                 return $activities;