Index: wp-admin/includes/theme.php =================================================================== --- wp-admin/includes/theme.php (revision 16042) +++ wp-admin/includes/theme.php (working copy) @@ -241,12 +241,14 @@ $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"'; - if ( ! current_user_can('update_themes') ) - printf( '
' . __('There is a new version of %1$s available. View version %3$s details.') . '
', $theme_name, $details_url, $update['new_version']); - else if ( empty($update['package']) ) - printf( '' . __('There is a new version of %1$s available. View version %3$s details. Automatic upgrade is unavailable for this theme.') . '
', $theme_name, $details_url, $update['new_version']); - else - printf( '' . __('There is a new version of %1$s available. View version %3$s details or upgrade automatically.') . '
', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick ); + if ( is_network_admin() || !is_multisite() ) { + if ( !current_user_can('update_themes') ) + printf( '' . __('There is a new version of %1$s available. View version %3$s details.') . '
', $theme_name, $details_url, $update['new_version']); + else if ( empty($update['package']) ) + printf( '' . __('There is a new version of %1$s available. View version %3$s details. Automatic upgrade is unavailable for this theme.') . '
', $theme_name, $details_url, $update['new_version']); + else + printf( '' . __('There is a new version of %1$s available. View version %3$s details or upgrade automatically.') . '
', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick ); + } } } Index: wp-admin/menu.php =================================================================== --- wp-admin/menu.php (revision 16042) +++ wp-admin/menu.php (working copy) @@ -30,7 +30,7 @@ if ( is_multisite() ) $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' ); - if ( is_super_admin() ) { + if ( is_super_admin() && !is_multisite() ) { $plugin_update_count = $theme_update_count = $wordpress_update_count = 0; $update_plugins = get_site_transient( 'update_plugins' ); if ( !empty($update_plugins->response) )