Changeset 5429

Timestamp:

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

Author:

djpaul

Message:

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

Location:

trunk

Files:

• bp-core/admin/bp-core-admin.php (modified) (2 diffs)
• bp-core/bp-core-functions.php (modified) (3 diffs)
• bp-forums/bp-forums-admin.php (modified) (1 diff)

trunk/bp-core/admin/bp-core-admin.php

@@ -74 +74 @@
  */
 function bp_core_admin_backpat_page() {
+    $settings_url = add_query_arg( 'page', 'bp-general-config', bp_core_do_network_admin() ? network_admin_url( 'settings.php' ) : admin_url( 'options-general.php' ) );
 ?>
     <div class="wrap">
@@ -80 +81 @@
 
         <p><?php _e( "Don't worry! We've moved the BuddyPress options into more convenient and easier to find locations. You're seeing this page because you are running a legacy BuddyPress plugin which has not been updated.", 'buddypress' ); ?></p>
-        <p><?php printf( __( 'Components, Pages, Settings, and Forums, have been moved to <a href="%s">Settings &gt; BuddyPress</a>. Profile Fields has been moved into the <a href="%s">Users</a> menu.', 'buddpress' ), network_admin_url( 'options-general.php?page=bp-general-config' ), network_admin_url( 'users.php?page=bp-profile-setup' ) ); ?></p>
+        <p><?php printf( __( 'Components, Pages, Settings, and Forums, have been moved to <a href="%s">Settings &gt; BuddyPress</a>. Profile Fields has been moved into the <a href="%s">Users</a> menu.', 'buddpress' ), $settings_url, network_admin_url( 'users.php?page=bp-profile-setup' ) ); ?></p>
     </div>
 <?php

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 );

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

@@ -10 +10 @@
 
     // Add the option pages
-    $hook = add_options_page( __( 'BuddyPress Forums', 'buddypress' ), __( 'BuddyPress Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', 'bp_forums_bbpress_admin' );
+    $page = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
+    $hook = add_submenu_page( $page, __( 'BuddyPress Forums', 'buddypress' ), __( 'BuddyPress Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', 'bp_forums_bbpress_admin' );
 
     // Add a hook for common BP admin CSS/JS scripts