Changes in branches/1.2/bp-core.php [3447:4066]

File:

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

branches/1.2/bp-core.php

@@ -285 +285 @@
         bp_core_install();
 }
-add_action( 'admin_menu', 'bp_core_check_installed' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_check_installed' );
 
 /**
@@ -301 +301 @@
         return false;
 
-    /* Add the administration tab under the "Site Admin" tab for site administrators */
+    // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
+    if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin()  )
+        return false;
+
+    // Add the administration tab under the "Site Admin" tab for site administrators
     bp_core_add_admin_menu_page( array(
         'menu_title' => __( 'BuddyPress', 'buddypress' ),
@@ -313 +317 @@
     add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
 }
-add_action( 'admin_menu', 'bp_core_add_admin_menu' );
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu' );
 
 /**