<!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" />
<title>[18224] trunk/wp-admin/update-core.php: Update Core UI changes:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18224">18224</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-06-10 05:37:51 +0000 (Fri, 10 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update Core UI changes:
* Update Now instead of Update Automatically.
* The first core update is now a primary button.
* Hide the version number from the 'You are about to install WP in English' warning for development versions, as it lies and suggests you will be downgraded.
see <a href="http://trac.wordpress.org/ticket/10611">#10611</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (18223 => 18224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2011-06-10 02:37:37 UTC (rev 18223)
+++ trunk/wp-admin/update-core.php 2011-06-10 05:37:51 UTC (rev 18224)
</span><span class="lines">@@ -19,12 +19,14 @@
</span><span class="cx">
</span><span class="cx"> function list_core_update( $update ) {
</span><span class="cx"> global $wp_local_package, $wpdb;
</span><ins>+ static $first_pass = true;
+
</ins><span class="cx"> $version_string = ('en_US' == $update->locale && 'en_US' == get_locale() ) ?
</span><span class="cx"> $update->current : sprintf("%s&ndash;<strong>%s</strong>", $update->current, $update->locale);
</span><span class="cx"> $current = false;
</span><span class="cx"> if ( !isset($update->response) || 'latest' == $update->response )
</span><span class="cx"> $current = true;
</span><del>- $submit = __('Update Automatically');
</del><ins>+ $submit = __('Update Now');
</ins><span class="cx"> $form_action = 'update-core.php?action=do-core-upgrade';
</span><span class="cx"> $php_version = phpversion();
</span><span class="cx"> $mysql_version = $wpdb->db_version();
</span><span class="lines">@@ -35,7 +37,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if ( $current ) {
</span><span class="cx"> $message = sprintf(__('You have the latest version of WordPress. You do not need to update. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);
</span><del>- $submit = __('Re-install Automatically');
</del><ins>+ $submit = __('Re-install Now');
</ins><span class="cx"> $form_action = 'update-core.php?action=do-core-reinstall';
</span><span class="cx"> } else {
</span><span class="cx"> $php_compat = version_compare( $php_version, $update->php_version, '>=' );
</span><span class="lines">@@ -63,8 +65,13 @@
</span><span class="cx"> echo '<input name="version" value="'. esc_attr($update->current) .'" type="hidden"/>';
</span><span class="cx"> echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
</span><span class="cx"> if ( $show_buttons ) {
</span><del>- submit_button( $submit, 'button', 'upgrade', false );
- echo '&nbsp;<a href="' . esc_url($update->package) . '" class="button">' . $download . '</a>&nbsp;';
</del><ins>+ if ( $first_pass ) {
+ submit_button( $submit, 'button button-primary', 'upgrade', false );
+ $first_pass = false;
+ } else {
+ submit_button( $submit, 'button', 'upgrade', false );
+ }
+ echo '&nbsp;<a href="' . esc_url( $update->package ) . '" class="button">' . $download . '</a>&nbsp;';
</ins><span class="cx"> }
</span><span class="cx"> if ( 'en_US' != $update->locale )
</span><span class="cx"> if ( !isset( $update->dismissed ) || !$update->dismissed )
</span><span class="lines">@@ -75,7 +82,7 @@
</span><span class="cx"> if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) )
</span><span class="cx"> echo '<p class="hint">'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'</p>';
</span><span class="cx"> else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) {
</span><del>- echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'</p>';
</del><ins>+ echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->response != 'development' ? $update->current : '' ).'</p>';
</ins><span class="cx"> }
</span><span class="cx"> echo '</form>';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>