Changeset 3775 for branches/1.2/bp-core.php

Timestamp:

01/20/2011 09:08:27 PM (14 years ago)

Author:

boonebgorges

Message:

Fixes function_exists error in previous commit. Adjusts admin menu hooks to be compatible with Network Admin in WP 3.1. Fixes #3017

File:

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

branches/1.2/bp-core.php

@@ -286 +286 @@
 }
 add_action( 'admin_menu', 'bp_core_check_installed' );
+add_action( 'network_admin_menu', 'bp_core_check_installed' );
 
 /**
@@ -301 +302 @@
         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' ),
@@ -314 +319 @@
 }
 add_action( 'admin_menu', 'bp_core_add_admin_menu' );
+add_action( 'network_admin_menu', 'bp_core_add_admin_menu' );
 
 /**