Changeset 538

Timestamp:

11/11/2008 11:28:43 AM (18 years ago)

Author:

apeatling

Message:

Fixed friend activity listing on Activity > My Friends.

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-classes.php (modified) (4 diffs)
• bp-core.php (modified) (1 diff)

trunk/bp-activity.php

@@ -189 +189 @@
     global $bp;
     
-    BP_Activity_Activity::get_activity_for_friends( $bp['loggedin_userid'] );
+    $friend_activity = BP_Activity_Activity::get_activity_for_friends( $bp['loggedin_userid'] );
+
     bp_catch_uri( 'activity/my-friends' );  
 }

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

@@ -158 +158 @@
         if ( !function_exists('friends_get_friend_ids_for_user') )
             return false;
-        
+
         $since = strtotime($since);
         
@@ -173 +173 @@
             // Use the cached activity stream.
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['activity']['table_name_loggedin_user_friends_cached'] . " WHERE date_recorded >= FROM_UNIXTIME(%d) ORDER BY date_recorded DESC $limit_sql", $since ) );
-            
+
             for ( $i = 0; $i < count( $activities ); $i++ ) {
                 $activities_formatted[$i]['content'] = $activities[$i]->content;
@@ -186 +186 @@
             
             $friend_ids = friends_get_friend_ids_for_user( $user_id );
-        
+
             for ( $i = 0; $i < count($friend_ids); $i++ ) {
-                $table_name = $wpdb->base_prefix . $field_ids[$i] . '_activity_cached';
-            
+                $table_name = $wpdb->base_prefix . 'user_' . $friend_ids[$i] . '_activity_cached';
+
                 $activities[$i]['activity'] = $wpdb->get_results( $wpdb->prepare( "SELECT content, date_recorded, component_name FROM " . $table_name . " WHERE is_private = 0 ORDER BY date_recorded LIMIT 5" ) );
                 $activities[$i]['full_name'] = bp_fetch_user_fullname( $friend_ids[$i], false );
@@ -198 +198 @@
                 /* Filter activities for friends to remove 'You' and 'your' */
                 for ( $j = 0; $j < count( $activities[$i]['activity']); $j++ ) {
-                    $activities[$i]['activity'][$j]->content = bp_activity_content_filter( $activities[$i]['activity'][$j]->content, $activities[$i]['activity'][$j]->date_recorded, $activities[$i]['full_name'], false, false );
+                    $activities[$i]['activity'][$j]->content = bp_activity_content_filter( $activities[$i]['activity'][$j]->content, $activities[$i]['activity'][$j]->date_recorded, $activities[$i]['full_name'], false, false, false );
                     $activities_formatted[] = array( 'user_id' => $friend_ids[$i], 'content' => $activities[$i]['activity'][$j]->content, 'date_recorded' => $activities[$i]['activity'][$j]->date_recorded, 'component_name' => $activities[$i]['activity'][$j]->component_name );
                 }

trunk/bp-core.php

@@ -12 +12 @@
 
 /* Load the language file */
-if ( file_exists(ABSPATH . 'wp-content/mu-plugins/bp-languages/buddypress-' . get_locale() . '.mo') )
+if ( file_exists( ABSPATH . 'wp-content/mu-plugins/bp-languages/buddypress-' . get_locale() . '.mo' ) )
     load_textdomain( 'buddypress', ABSPATH . 'wp-content/mu-plugins/bp-languages/buddypress-' . get_locale() . '.mo' );