<!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>[49638] trunk/src: Upgrade/Install: Consistent layout and accurate messages on the update screen.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/49638">49638</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/49638","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-11-17 20:26:32 +0000 (Tue, 17 Nov 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Upgrade/Install: Consistent layout and accurate messages on the update screen.
* Clarifies that if you are on maintenance/security auto-updates that you are only on those and therefore there are more options available.
* Adds a message if a version control system has been detected, as automatic updates are disabled in that case.
* Ensures only one heading between `update available`, `you are on a dev version`, and `you are on latest` appears at any given time, falling back to `you are on latest` if something strange happens with the returned update data.
* Removes some older strings related to auto-updates, which greatly simplifies the above.
* Strips the `core-major-auto-updates-saved` query arg from the URL, as it is related to a dismissible notice.
Props audrasjb, pbiron, helen.
Fixes <a href="https://core.trac.wordpress.org/ticket/51742">#51742</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2020-11-17 20:07:57 UTC (rev 49637)
+++ trunk/src/wp-admin/update-core.php 2020-11-17 20:26:32 UTC (rev 49638)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $show_buttons = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'development' === $update->response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build manually:' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'You can update to the latest nightly build manually:' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $current ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress version. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,28 +232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_version = get_bloginfo( 'version' );
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = get_core_updates();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $updates[0]->response ) || 'latest' === $updates[0]->response ) {
- echo '<h2>';
- _e( 'You have the latest version of WordPress.' );
-
- if ( wp_http_supports( array( 'ssl' ) ) ) {
- require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
- $upgrader = new WP_Automatic_Updater;
- $future_minor_update = (object) array(
- 'current' => $wp_version . '.1.next.minor',
- 'version' => $wp_version . '.1.next.minor',
- 'php_version' => $required_php_version,
- 'mysql_version' => $required_mysql_version,
- );
- $should_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
- if ( $should_auto_update ) {
- echo ' ' . __( 'Future security updates will be applied automatically.' );
- }
- }
- echo '</h2>';
- }
-
- if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $updates[0] ) && isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<h2 class="response">';
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'An updated version of WordPress is available.' );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</h2>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,18 +245,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/updating-wordpress/' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p></div>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $updates[0] ) && 'development' === $updates[0]->response ) {
+ echo '<h2 class="response">' . __( 'You are using a development version of WordPress.' ) . '</h2>';
+ } else {
+ echo '<h2 class="response">' . __( 'You have the latest version of WordPress.' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $updates[0] ) && 'development' === $updates[0]->response ) {
- require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
- $upgrader = new WP_Automatic_Updater;
- if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
- echo '<div class="updated inline"><p>';
- echo '<strong>' . __( 'BETA TESTERS:' ) . '</strong> ' . __( 'This site is set up to install updates of future beta versions automatically.' );
- echo '</p></div>';
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> echo '<ul class="core-updates">';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $updates as $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<li>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,24 +368,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="auto-update-status">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $upgrade_major ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+ $updater = new WP_Automatic_Updater();
+ if ( $updater->is_vcs_checkout( ABSPATH ) ) {
+ _e( 'This site appears to be under version control. Automatic updates are disabled.' );
+ } elseif ( $upgrade_major ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'This site is automatically kept up to date with each new version of WordPress.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_set_update_option ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<br>';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<a href="%s">%s</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<a href="%s" class="core-auto-update-settings-link core-auto-update-settings-link-disable">%s</a>',
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_url( add_query_arg( 'value', 'disable', $action_url ), 'core-major-auto-updates-nonce' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Switch to automatic updates for maintenance and security releases only.' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $upgrade_minor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'This site is automatically kept up to date with maintenance and security releases of WordPress.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _e( 'This site is automatically kept up to date with maintenance and security releases of WordPress only.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_set_update_option ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<br>';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<a href="%s">%s</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<a href="%s" class="core-auto-update-settings-link core-auto-update-settings-link-enable">%s</a>',
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_url( add_query_arg( 'value', 'enable', $action_url ), 'core-major-auto-updates-nonce' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Enable automatic updates for all new versions of WordPress.' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-11-17 20:07:57 UTC (rev 49637)
+++ trunk/src/wp-includes/functions.php 2020-11-17 20:26:32 UTC (rev 49638)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1186,6 +1186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activated',
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin_email_remind_later',
</span><span class="cx" style="display: block; padding: 0 10px"> 'approved',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'core-major-auto-updates-saved',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deactivate',
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete_count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'deleted',
</span></span></pre>
</div>
</div>
</body>
</html>