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

Timestamp:

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

Author:

johnjamesjacoby

Message:

Fixes #2561 props wpmuguru

File:

• branches/1.2/bp-messages.php (modified) (2 diffs)

branches/1.2/bp-messages.php

@@ -67 +67 @@
 
 function messages_setup_globals() {
-    global $bp, $wpdb;
+    global $bp;
 
     /* For internal identification */
     $bp->messages->id = 'messages';
 
-    $bp->messages->table_name_messages = $wpdb->base_prefix . 'bp_messages_messages';
-    $bp->messages->table_name_recipients = $wpdb->base_prefix . 'bp_messages_recipients';
-    $bp->messages->table_name_notices = $wpdb->base_prefix . 'bp_messages_notices';
+    $bp->messages->slug = BP_MESSAGES_SLUG;
+
+    $bp->messages->table_name_notices    = $bp->table_prefix . 'bp_messages_notices';
+    $bp->messages->table_name_messages   = $bp->table_prefix . 'bp_messages_messages';
+    $bp->messages->table_name_recipients = $bp->table_prefix . 'bp_messages_recipients';
+
     $bp->messages->format_notification_function = 'messages_format_notifications';
-    $bp->messages->slug = BP_MESSAGES_SLUG;
 
     /* Register this in the active components array */
@@ -86 +88 @@
 
 function messages_check_installed() {
-    global $wpdb, $bp;
+    global $bp;
 
     if ( !is_site_admin() )