<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13588] trunk/wp-admin: Move Tools -> Upgrade to Dashboard -> Updates.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13588">13588</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-04 21:24:43 +0000 (Thu, 04 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move Tools -> Upgrade to Dashboard -> Updates. As per dev meetup today. See <a href="http://trac.wordpress.org/ticket/12517">#12517</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (13587 => 13588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-03-04 21:20:55 UTC (rev 13587)
+++ trunk/wp-admin/menu.php 2010-03-04 21:24:43 UTC (rev 13588)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first', 'menu-dashboard', 'div' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if ( is_super_admin() )
+ $submenu[ 'index.php' ][10] = array( __('Updates'), 'install_plugins', 'update-core.php');
+
</ins><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $submenu[ 'index.php' ][0] = array( __('Dashboard'), 'read', 'index.php' );
</span><span class="cx"> $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
</span><span class="lines">@@ -150,8 +153,6 @@
</span><span class="cx"> $submenu['tools.php'][5] = array( __('Tools'), 'read', 'tools.php' );
</span><span class="cx"> $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
</span><span class="cx"> $submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
</span><del>- if ( is_super_admin() )
- $submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins', 'update-core.php');
</del><span class="cx"> if ( is_multisite() && ($current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path) )
</span><span class="cx"> $submenu['tools.php'][25] = array( __('Delete Blog'), 'manage_options', 'ms-delete-site.php' );
</span><span class="cx"> if ( !is_multisite() && is_super_admin() && defined('WP_ENABLE_MULTISITE') )
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (13587 => 13588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-03-04 21:20:55 UTC (rev 13587)
+++ trunk/wp-admin/update-core.php 2010-03-04 21:24:43 UTC (rev 13588)
</span><span class="lines">@@ -116,8 +116,8 @@
</span><span class="cx"> $updates = get_core_updates();
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>- <?php screen_icon(); ?>
- <h2><?php _e('Upgrade WordPress'); ?></h2>
</del><ins>+ <?php screen_icon('tools'); ?>
+ <h2><?php _e('WordPress Updates'); ?></h2>
</ins><span class="cx"> <?php
</span><span class="cx"> if ( $upgrade_error ) {
</span><span class="cx"> echo '<div class="error"><p>';
</span></span></pre>
</div>
</div>
</body>
</html>