Changeset 12613

Timestamp:

01/06/2010 11:41:03 PM (15 years ago)

Author:

ryan

Message:

Move some multisite menu checks directly into menu.php. see #11763

Location:

trunk/wp-admin

Files:

• includes/ms.php (modified) (1 diff)
• menu.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -551 +551 @@
 function wpmu_menu() {
     global $menu, $submenu, $current_user;
-
-    if( is_site_admin() ) {
-        $menu[1] = array( '', 'read', '', '', 'wp-menu-separator' );
-        $menu[2] = array(__('Site Admin'), '10', 'wpmu-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
-        $submenu[ 'wpmu-admin.php' ][1] = array( __('Admin'), '10', 'wpmu-admin.php' );
-        $submenu[ 'wpmu-admin.php' ][5] = array( __('Blogs'), '10', 'wpmu-blogs.php' );
-        $submenu[ 'wpmu-admin.php' ][10] = array( __('Users'), '10', 'wpmu-users.php' );
-        $submenu[ 'wpmu-admin.php' ][20] = array( __('Themes'), '10', 'wpmu-themes.php' );
-        $submenu[ 'wpmu-admin.php' ][25] = array( __('Options'), '10', 'wpmu-options.php' );
-        $submenu[ 'wpmu-admin.php' ][30] = array( __('Upgrade'), '10', 'wpmu-upgrade-site.php' );
-    }
-
-    if( !is_site_admin() )
-        unset( $submenu['plugins.php'][10] ); // always remove the plugin installer for regular users
-    unset( $submenu['plugins.php'][15] ); // always remove the plugin editor
-    unset( $submenu['themes.php'][10] ); // always remove the themes editor
 
     $menu_perms = get_site_option( "menu_items" );

trunk/wp-admin/menu.php

@@ -28 +28 @@
 $menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top', 'menu-dashboard', 'div' );
 
+if ( is_multisite() && is_super_admin() ) {
+    $menu[1] = array( '', 'read', 'separator0', '', 'wp-menu-separator' );
+    $menu[2] = array(__('Site Admin'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
+    $submenu[ 'ms-admin.php' ][1] = array( __('Admin'), 'delete_users', 'ms-admin.php' );
+    $submenu[ 'ms-admin.php' ][5] = array( __('Blogs'), 'delete_users', 'ms-blogs.php' );
+    $submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'delete_users', 'ms-users.php' );
+    $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'delete_users', 'ms-themes.php' );
+    $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'delete_users', 'ms-options.php' );
+    $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), 'delete_users', 'ms-upgrade-site.php' );
+}
+
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
@@ -89 +100 @@
 $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top', 'menu-appearance', 'div' );
     $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
-    $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
+    if ( !is_multisite() )
+        $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
     $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
 
@@ -99 +111 @@
 $menu[65] = array( sprintf( __('Plugins %s'), "<span class='update-plugins count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' );
     $submenu['plugins.php'][5]  = array( __('Installed'), 'activate_plugins', 'plugins.php' );
-    /* translators: add new plugin */
-    $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
-    $submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
+    if ( is_super_admin() ) {
+        /* translators: add new plugin */
+        $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
+    }
+    if ( !is_multisite() )
+        $submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
 
 if ( current_user_can('edit_users') )