Changeset 5429 for trunk/bp-core/bp-core-functions.php

Timestamp:

12/01/2011 05:57:55 PM (15 years ago)

Author:

djpaul

Message:

Multisite fixes for the relocated admin menu. See #3785, props boonebgorges for help with patch

File:

• trunk/bp-core/bp-core-functions.php (modified) (3 diffs)

trunk/bp-core/bp-core-functions.php

@@ -340 +340 @@
 
     $hooks = array();
+    $page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
 
     // Changed in BP 1.6 . See bp_core_admin_backpat_menu()
@@ -346 +347 @@
 
     // Add the option pages
-    $hooks[] = add_options_page( __( 'BuddyPress Components', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-config', 'bp_core_admin_component_setup' );
-    $hooks[] = add_options_page( __( 'BuddyPress Pages', 'buddypress' ),      __( 'BuddyPress Pages', 'buddypress' ),      'manage_options', 'bp-page-settings',  'bp_core_admin_page_setup'      );
-    $hooks[] = add_options_page( __( 'BuddyPress Settings', 'buddypress' ),   __( 'BuddyPress Settings', 'buddypress' ),   'manage_options', 'bp-settings',       'bp_core_admin_settings'        );
+    $hooks[] = add_submenu_page( $page, __( 'BuddyPress Components', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-config', 'bp_core_admin_component_setup' );
+    $hooks[] = add_submenu_page( $page, __( 'BuddyPress Pages', 'buddypress' ),      __( 'BuddyPress Pages', 'buddypress' ),      'manage_options', 'bp-page-settings',  'bp_core_admin_page_setup'      );
+    $hooks[] = add_submenu_page( $page, __( 'BuddyPress Settings', 'buddypress' ),   __( 'BuddyPress Settings', 'buddypress' ),   'manage_options', 'bp-settings',       'bp_core_admin_settings'        );
 
     foreach( $hooks as $hook ) {
@@ -365 +366 @@
  */
 function bp_core_modify_admin_menu() {
-    remove_submenu_page( 'options-general.php', 'bb-forums-setup' );
-    remove_submenu_page( 'options-general.php', 'bp-page-settings' );
-    remove_submenu_page( 'options-general.php', 'bp-settings' );
+    $page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
+
+    remove_submenu_page( $page, 'bb-forums-setup' );
+    remove_submenu_page( $page, 'bp-page-settings' );
+    remove_submenu_page( $page, 'bp-settings' );
 }
 add_action( "admin_head", 'bp_core_modify_admin_menu', 999 );