Changeset 3706 for trunk/bp-core.php

Timestamp:

01/14/2011 07:35:58 AM (14 years ago)

Author:

johnjamesjacoby

Message:

First round of WordPress 3.1 adjustments for BuddyPress installer/upgrader.

File:

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

trunk/bp-core.php

@@ -299 +299 @@
     require ( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-admin.php' );
 }
-add_action( 'admin_menu', 'bp_core_admin_menu_init' );
+is_multisite() ? add_action( 'network_admin_menu', 'bp_core_admin_menu_init' ) : add_action( 'admin_menu', 'bp_core_admin_menu_init' );
 
 /**
@@ -315 +315 @@
         return false;
 
-    /* Add the administration tab under the "Site Admin" tab for site administrators */
+    // Add the administration tab under the "Site Admin" tab for site administrators
     $hook = bp_core_add_admin_menu_page( array(
-        'menu_title' => __( 'BuddyPress', 'buddypress' ),
-        'page_title' => __( 'BuddyPress', 'buddypress' ),
-        'access_level' => 10, 'file' => 'bp-general-settings',
-        'function' => 'bp_core_admin_dashboard',
-        'position' => 2
+        'menu_title'   => __( 'BuddyPress', 'buddypress' ),
+        'page_title'   => __( 'BuddyPress', 'buddypress' ),
+        'capability'   => 'manage_options',
+        'file'         => 'bp-general-settings',
+        'function'     => 'bp_core_admin_dashboard',
+        'position'     => 2
     ) );
 
     add_submenu_page( 'bp-general-settings', __( 'BuddyPress Dashboard', 'buddypress' ), __( 'Dashboard', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_dashboard' );
-    add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ), __( 'Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' );
-
-    /* Add a hook for css/js */
+    add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ),             __( 'Settings',  'buddypress' ), 'manage_options', 'bp-settings',         'bp_core_admin_settings'  );
+
+    // Add a hook for css/js
     add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
 }
-add_action( 'admin_menu', 'bp_core_add_admin_menu' );
+is_multisite() ? add_action( 'network_admin_menu', 'bp_core_add_admin_menu' ) : add_action( 'admin_menu', 'bp_core_add_admin_menu' );
 
 /**
@@ -1816 +1817 @@
 
     $defaults = array(
-        'page_title' => '',
-        'menu_title' => '',
-        'access_level' => 2,
-        'file' => false,
-        'function' => false,
-        'icon_url' => false,
-        'position' => 100
+        'page_title'   => '',
+        'menu_title'   => '',
+        'capability'   => 'manage_options',
+        'file'         => false,
+        'function'     => false,
+        'icon_url'     => false,
+        'position'     => 100
     );
 
@@ -1845 +1846 @@
     } while ( !empty( $menu[$position] ) );
 
-    $menu[$position] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+    $menu[$position] = array ( $menu_title, $capability, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
 
     $_registered_pages[$hookname] = true;