Changeset 4602 for trunk/bp-forums/bp-forums-admin.php

Timestamp:

07/04/2011 04:59:01 PM (13 years ago)

Author:

johnjamesjacoby

Message:

• Swap BP_ROOT_BLOG const usage for new bp_get_root_blog_id() function
• Use bp_get_root_blog_id() place of bp_get_option_blog_id()
• Check for BP_ENABLE_MULTIBLOG when assigning root blog ID

See #3313, #3314.

File:

• trunk/bp-forums/bp-forums-admin.php (modified) (1 diff)

trunk/bp-forums/bp-forums-admin.php

@@ -190 +190 @@
     $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, 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
+    $file .= "\n" .   '$bb->name = \'' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
 
     if ( is_multisite() )
-        $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
+        $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . bp_get_root_blog_id() . ';';
 
     if ( defined( 'AUTH_SALT' ) )