Ticket #3231: 3231.diff

bp-forums/bp-forums-admin.php

@@ -182 +182 @@
 
         $file .= "\n" .   '$bb->custom_user_table = \'' . $wpdb->users . '\';';
         $file .= "\n" .   '$bb->custom_user_meta_table = \'' . $wpdb->usermeta . '\';';
-        $file .= "\n\n" . '$bb->uri = \'' . BP_PLUGIN_URL . '/bp-forums/bbpress/\';';
-        $file .= "\n" .   '$bb->name = \'' . get_blog_option( BP_ROOT_BLOG, 'name' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
-
-        if ( is_multisite() )
-                $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
-
+        $file .= "\n\n" . 'if( function_exists( \'bp_core_get_table_prefix\' ) && is_multisite() ) {';
+        $file .= "\n\t" . '$bb_table_prefix = bp_core_get_table_prefix() . \'bb_\';';
+        $file .= "\n\t" . '$bb->name = get_blog_option( BP_ROOT_BLOG, \'blogname\' ) . ' . '\' ' . __( 'Forums', 'buddypress' ) . '\';';
+        $file .= "\n\t" . '$bb->uri = BP_PLUGIN_URL . \'/bp-forums/bbpress/\';';
+        $file .= "\n\t" . '$current_site = get_current_site();';
+        $file .= "\n\t" . '$bb->wordpress_mu_primary_blog_id = $current_site->blog_id;';
+        $file .= "\n" .   '} else {';
+        $file .= "\n\t" . '$bb->name = \'' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
+        $file .= "\n\t" . '$bb->uri = \'' . BP_PLUGIN_URL . '/bp-forums/bbpress/\';';
+        $file .= "\n" .   '}';
+        
         if ( defined( 'AUTH_SALT' ) )
                 $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', \'' . addslashes( AUTH_SALT ) . '\');';