From 13d204b3f9ed86e8b598cfc035d4cbca7765dc20 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 4 Mar 2010 21:24:43 +0000
Subject: [PATCH] Move Tools -> Upgrade to Dashboard -> Updates. As per dev
 meetup today. See #12517

git-svn-id: http://svn.automattic.com/wordpress/trunk@13588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php        | 5 +++--
 wp-admin/update-core.php | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 5ae1efbf6..711dc19eb 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -43,6 +43,9 @@ if ( is_multisite() && is_super_admin() ) {
 	$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first', 'menu-dashboard', 'div' );
 }
 
+if ( is_super_admin() )
+	$submenu[ 'index.php' ][10] = array( __('Updates'), 'install_plugins',  'update-core.php');
+
 if ( is_multisite() ) {
 	$submenu[ 'index.php' ][0] = array( __('Dashboard'), 'read', 'index.php' );
 	$submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
@@ -150,8 +153,6 @@ $menu[75] = array( __('Tools'), 'read', 'tools.php', '', 'menu-top', 'menu-tools
 	$submenu['tools.php'][5] = array( __('Tools'), 'read', 'tools.php' );
 	$submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
 	$submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
-	if ( is_super_admin() )
-		$submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins',  'update-core.php');
 	if ( is_multisite() && ($current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path) )
 		$submenu['tools.php'][25] = array( __('Delete Blog'), 'manage_options', 'ms-delete-site.php' );
 	if ( !is_multisite() && is_super_admin() && defined('WP_ENABLE_MULTISITE') )
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index fcba00c80..3835be731 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -116,8 +116,8 @@ function core_upgrade_preamble() {
 	$updates = get_core_updates();
 ?>
 	<div class="wrap">
-	<?php screen_icon(); ?>
-	<h2><?php _e('Upgrade WordPress'); ?></h2>
+	<?php screen_icon('tools'); ?>
+	<h2><?php _e('WordPress Updates'); ?></h2>
 <?php
 	if ( $upgrade_error ) {
 		echo '<div class="error"><p>';