diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-14 15:37:24 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-14 15:37:24 +0000 |
| commit | 3c4bd86c143db30af453982eecd2d88a06dd301e (patch) | |
| tree | 09964dfdacf25a8fdc390fbcccf3a670ead4c4d2 /wp-admin/menu.php | |
| parent | 53998a5af58776f930eb66f1916db9042f418c91 (diff) | |
| download | wordpress-mu-3c4bd86c143db30af453982eecd2d88a06dd301e.tar.gz wordpress-mu-3c4bd86c143db30af453982eecd2d88a06dd301e.tar.xz wordpress-mu-3c4bd86c143db30af453982eecd2d88a06dd301e.zip | |
Move site admin menu around so add_submenu_page() doesn't break (fixes #233)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@842 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/menu.php')
| -rw-r--r-- | wp-admin/menu.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/wp-admin/menu.php b/wp-admin/menu.php index c12bb70..59265d8 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -73,6 +73,17 @@ $submenu['options-general.php'][35] = array(__('Permalinks'), 'manage_options', $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php'); //$submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php'); +get_currentuserinfo(); +if( is_site_admin() ) { + $menu[1] = array(__('Site Admin'), '10', 'wpmu-admin.php' ); + $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' ); +} + // Create list of page plugin hook names. foreach ($menu as $menu_page) { $admin_page_hooks[$menu_page[2]] = sanitize_title($menu_page[0]); @@ -134,15 +145,7 @@ foreach ( $menu as $id => $data ) { } unset($id); -get_currentuserinfo(); -if( is_site_admin() ) { - $menu[1] = array( __('Site 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' ); -} + uksort($menu, "strnatcasecmp"); // make it all pretty if (! user_can_access_admin_page()) { |