Changeset 394 for trunk/bp-activity.php

Timestamp:

10/23/2008 12:56:37 PM (17 years ago)

Author:

apeatling

Message:

Removed home base requirement

File:

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

trunk/bp-activity.php

@@ -96 +96 @@
     
     $bp['activity'] = array(
-        'table_name_loggedin_user' => $wpdb->base_prefix . $bp['loggedin_homebase_id'] . '_activity',
-        'table_name_loggedin_user_cached' => $wpdb->base_prefix . $bp['loggedin_homebase_id'] . '_activity_cached',
-        
-        'table_name_current_user' => $wpdb->base_prefix . $bp['current_homebase_id'] . '_activity',
-        'table_name_current_user_cached' => $wpdb->base_prefix . $bp['current_homebase_id'] . '_activity_cached',
-        
-        'table_name_loggedin_user_friends_cached' => $wpdb->base_prefix . $bp['loggedin_homebase_id'] . '_friends_activity_cached',
+        'table_name_loggedin_user' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_activity',
+        'table_name_loggedin_user_cached' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_activity_cached',
+        
+        'table_name_current_user' => $wpdb->base_prefix . 'user_' . $bp['current_userid'] . '_activity',
+        'table_name_current_user_cached' => $wpdb->base_prefix . 'user_' . $bp['current_userid'] . '_activity_cached',
+        
+        'table_name_loggedin_user_friends_cached' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_friends_activity_cached',
         'table_name_sitewide' => $wpdb->base_prefix . 'bp_activity_sitewide',
         
@@ -115 +115 @@
     }
 }
-add_action( 'wp', 'bp_activity_setup_globals', 1 ); 
+add_action( 'wp', 'bp_activity_setup_globals', 1 );
 add_action( '_admin_menu', 'bp_activity_setup_globals', 1 );
 
@@ -180 +180 @@
 /***** Actions **********/
 
-function bp_activity_record( $item_id, $component_name, $component_action, $is_private, $dual_record = false, $secondary_user_homebase_id = false ) {
+function bp_activity_record( $item_id, $component_name, $component_action, $is_private, $dual_record = false ) {
     global $bp, $wpdb;
 
@@ -196 +196 @@
     /* Save an activity entry for both logged in and secondary user. For example for a new friend connection
        you would want to show "X and Y are now friends" on both users activity stream */
-    if ( $dual_record && $secondary_user_homebase_id ) {
+    if ( $dual_record  ) {
         $table_name = $wpdb->base_prefix . $secondary_user_homebase_id . '_activity';
         $table_name_cached = $wpdb->base_prefix . $secondary_user_homebase_id . '_activity_cached';