Changeset 3186 for branches/1.2/bp-activity.php

Timestamp:

08/12/2010 06:33:05 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2561 props wpmuguru

File:

• branches/1.2/bp-activity.php (modified) (3 diffs)

branches/1.2/bp-activity.php

@@ -74 +74 @@
 
 function bp_activity_setup_globals() {
-    global $bp, $wpdb, $current_blog;
+    global $bp, $current_blog;
 
     /* Internal identifier */
     $bp->activity->id = 'activity';
 
-    $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity';
-    $bp->activity->table_name_meta = $wpdb->base_prefix . 'bp_activity_meta';
     $bp->activity->slug = BP_ACTIVITY_SLUG;
+
+    $bp->activity->table_name      = $bp->table_prefix . 'bp_activity';
+    $bp->activity->table_name_meta = $bp->table_prefix . 'bp_activity_meta';
+
     $bp->activity->format_notification_function = 'bp_activity_format_notifications';
 
@@ -92 +94 @@
 
 function bp_activity_check_installed() {
-    global $wpdb, $bp;
+    global $bp;
 
     if ( get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_DB_VERSION )
@@ -624 +626 @@
 
 function bp_activity_add( $args = '' ) {
-    global $bp, $wpdb;
+    global $bp;
 
     $defaults = array(