<!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>[49587] trunk/src/wp-admin: Upgrade/Install: Better UI for auto-update settings on 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/49587">49587</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/49587","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-12 22:35:54 +0000 (Thu, 12 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: Better UI for auto-update settings on update screen.
This adds clearer messages about what your current settings mean for updates, uses a more compact link-based action instead of a checkbox to change the setting, and respects constants and filters.
Props audrasjb, karmatosed, helen, azaozz, hedgefield, marybaum.
Fixes <a href="https://core.trac.wordpress.org/ticket/51742">#51742</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadminincludesclasscoreupgraderphp">trunk/src/wp-admin/includes/class-core-upgrader.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></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/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2020-11-12 22:03:36 UTC (rev 49586)
+++ trunk/src/wp-admin/css/common.css 2020-11-12 22:35:54 UTC (rev 49587)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1600,6 +1600,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: -4px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+h2.wp-current-version {
+ margin-bottom: .3em;
+}
+
+p.update-last-checked {
+ margin-top: 0;
+}
+
+p.auto-update-status {
+ margin-top: 2em;
+ line-height: 1.8;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #ajax-loading,
</span><span class="cx" style="display: block; padding: 0 10px"> .ajax-loading,
</span><span class="cx" style="display: block; padding: 0 10px"> .ajax-feedback,
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscoreupgraderphp"></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/includes/class-core-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-core-upgrader.php 2020-11-12 22:03:36 UTC (rev 49586)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2020-11-12 22:35:54 UTC (rev 49587)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,9 +279,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_is_development_version = (bool) strpos( $wp_version, '-' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Defaults:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_dev = get_site_option( 'auto_update_core_dev', true );
- $upgrade_minor = get_site_option( 'auto_update_core_minor', true );
- $upgrade_major = get_site_option( 'auto_update_core_major', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_dev = get_site_option( 'auto_update_core_dev', 'enabled' ) === 'enabled';
+ $upgrade_minor = get_site_option( 'auto_update_core_minor', 'enabled' ) === 'enabled';
+ $upgrade_major = get_site_option( 'auto_update_core_major', 'unset' ) === 'enabled';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'minor', false.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {
</span></span></pre></div>
<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-12 22:03:36 UTC (rev 49586)
+++ trunk/src/wp-admin/update-core.php 2020-11-12 22:35:54 UTC (rev 49587)
</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 automatically:' );
</del><ins style="background-color: #dfd; 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:' );
</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">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Installed WordPress version number, 2: URL to WordPress release notes, 3: New WordPress version number, including locale if necessary. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can update from WordPress %1$s to <a href="%2$s">WordPress %3$s</a> automatically:' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You can update from WordPress %1$s to <a href="%2$s">WordPress %3$s</a> manually:' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_version,
</span><span class="cx" style="display: block; padding: 0 10px"> $version_url,
</span><span class="cx" style="display: block; padding: 0 10px"> $version_string
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,11 @@
</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"> if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="notice notice-warning"><p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<h2 class="response">';
+ _e( 'An updated version of WordPress is available.' );
+ echo '</h2>';
+
+ echo '<div class="notice notice-warning inline"><p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Documentation on WordPress backups, 2: Documentation on updating WordPress. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>Important:</strong> Before updating, please <a href="%1$s">back up your database and files</a>. For help with updates, visit the <a href="%2$s">Updating WordPress</a> documentation page.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,10 +266,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- echo '<h2 class="response">';
- _e( 'An updated version of WordPress is available.' );
- echo '</h2>';
</del><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"> if ( isset( $updates[0] ) && 'development' === $updates[0]->response ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,22 +306,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function core_auto_updates_settings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_major_value = '';
- if ( isset( $_POST['core-auto-updates-settings'] ) && wp_verify_nonce( $_POST['set_core_auto_updates_settings'], 'core-auto-updates-nonce' ) ) {
- if ( isset( $_POST['core-auto-updates-major'] ) && 1 === (int) $_POST['core-auto-updates-major'] ) {
- update_site_option( 'auto_update_core_major', 1 );
- } else {
- update_site_option( 'auto_update_core_major', 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['core-major-auto-updates-saved'] ) ) {
+ if ( 'enabled' === $_GET['core-major-auto-updates-saved'] ) {
+ $notice_text = __( 'Automatic updates for all WordPress versions have been enabled. Thank you!' );
+ echo '<div class="notice notice-success is-dismissible"><p>' . $notice_text . '</p></div>';
+ } elseif ( 'disabled' === $_GET['core-major-auto-updates-saved'] ) {
+ $notice_text = __( 'WordPress will only receive automatic security and maintenance releases from now on.' );
+ echo '<div class="notice notice-success is-dismissible"><p>' . $notice_text . '</p></div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="notice notice-success is-dismissible"><p>';
- _e( 'WordPress auto-update settings updated.' );
- echo '</p></div>';
</del><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">- $upgrade_dev = get_site_option( 'auto_update_core_dev', true );
- $upgrade_minor = get_site_option( 'auto_update_core_minor', true );
- $upgrade_major = get_site_option( 'auto_update_core_major', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Defaults:
+ $upgrade_dev = get_site_option( 'auto_update_core_dev', 'enabled' ) === 'enabled';
+ $upgrade_minor = get_site_option( 'auto_update_core_minor', 'enabled' ) === 'enabled';
+ $upgrade_major = get_site_option( 'auto_update_core_major', 'unset' ) === 'enabled';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_set_update_option = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> // WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'minor', false.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === WP_AUTO_UPDATE_CORE ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,8 +343,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_minor = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_major = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // The UI is overridden by the WP_AUTO_UPDATE_CORE constant.
+ $can_set_update_option = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'AUTOMATIC_UPDATER_DISABLED' ) ) {
+ if ( true === AUTOMATIC_UPDATER_DISABLED ) {
+ $upgrade_dev = false;
+ $upgrade_minor = false;
+ $upgrade_major = false;
+ }
+ // The UI is overridden by the AUTOMATIC_UPDATER_DISABLED constant.
+ $can_set_update_option = false;
+ }
+
+ // Is the UI overridden by a plugin using the allow_major_auto_core_updates filter?
+ if ( has_filter( 'allow_major_auto_core_updates' ) ) {
+ $can_set_update_option = false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/class-core-upgrader.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_dev = apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/class-core-upgrader.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,40 +375,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'minor' => $upgrade_minor,
</span><span class="cx" style="display: block; padding: 0 10px"> 'major' => $upgrade_major,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $upgrade_major ) {
+ $wp_version = get_bloginfo( 'version' );
+ $updates = get_core_updates();
+
+ if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
+ echo '<p>' . wp_get_auto_update_message() . '</p>';
+ }
+ }
+
+ $action_url = self_admin_url( 'update-core.php?action=core-major-auto-updates-settings' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form method="post" action="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" name="core-auto-updates" class="form-core-auto-updates">
- <?php wp_nonce_field( 'core-auto-updates-nonce', 'set_core_auto_updates_settings' ); ?>
- <h2><?php _e( 'Auto-update settings' ); ?></h2>
- <p>
- <?php
- if ( $auto_update_settings['major'] ) {
- $wp_version = get_bloginfo( 'version' );
- $updates = get_core_updates();
- if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
- echo wp_get_auto_update_message();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <p class="auto-update-status">
+ <?php
+ if ( $upgrade_major ) {
+ _e( 'This site is automatically kept up to date with each new version of WordPress.' );
+
+ if ( $can_set_update_option ) {
+ echo '<br>';
+ echo sprintf(
+ /* Translators: Action link to disable core auto-updates. */
+ __( '<a href="%s">Switch to automatic updates for maintenance and security releases only.</a>' ),
+ wp_nonce_url( add_query_arg( 'value', 'disable', $action_url ), 'core-major-auto-updates-nonce' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- </p>
- <p>
- <input type="checkbox" name="core-auto-updates-major" id="core-auto-updates-major" value="1" <?php checked( $auto_update_settings['major'], 1 ); ?> />
- <label for="core-auto-updates-major">
- <?php _e( 'Automatically keep this site up-to-date with regular feature updates.' ); ?>
- </label>
- </p>
- <?php
- /**
- * Fires after the major core auto-update checkbox.
- *
- * @since 5.6.0
- */
- do_action( 'after_core_auto_updates_settings_fields', $auto_update_settings );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $upgrade_minor ) {
+ _e( 'This site is automatically kept up to date with maintenance and security releases of WordPress.' );
+
+ if ( $can_set_update_option ) {
+ echo '<br>';
+ echo sprintf(
+ /* Translators: Action link to enable core auto-updates. */
+ __( '<a href="%s">Enable automatic updates for all new versions of WordPress.</a>' ),
+ wp_nonce_url( add_query_arg( 'value', 'enable', $action_url ), 'core-major-auto-updates-nonce' )
+ );
+ }
+ } else {
+ _e( 'This site will not receive automatic updates for new versions of WordPress.' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <input id="core-auto-updates-settings" class="button" type="submit" value="<?php esc_attr_e( 'Save' ); ?>" name="core-auto-updates-settings" />
- </p>
- </form>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires after the major core auto-update settings.
+ *
+ * @since 5.6.0
+ */
+ do_action( 'after_core_auto_updates_settings', $auto_update_settings );
</ins><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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,6 +991,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'WordPress Updates' ); ?></h1>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Here you can find information about updates, set auto-updates and see what plugins or themes need updating.' ); ?></p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $upgrade_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="error"><p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,7 +1011,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $last_update_check = $current->last_checked + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
</span><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">- echo '<p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<h2 class="wp-current-version">';
+ /* translators: Current version of WordPress. */
+ printf( __( 'Current version: %s' ), get_bloginfo( 'version' ) );
+ echo '</h2>';
+
+ echo '<p class="update-last-checked">';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Date, 2: Time. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ), $last_update_check ), date_i18n( __( 'g:i a' ), $last_update_check ) );
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' <a href="' . esc_url( self_admin_url( 'update-core.php?force-check=1' ) ) . '">' . __( 'Check again.' ) . '</a>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -982,8 +1023,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_core' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ core_auto_updates_settings();
</ins><span class="cx" style="display: block; padding: 0 10px"> core_upgrade_preamble();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- core_auto_updates_settings();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list_plugin_updates();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,6 +1199,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-footer.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'core-major-auto-updates-settings' === $action ) {
+ $redirect_url = self_admin_url( 'update-core.php' );
+
+ if ( isset( $_GET['value'] ) ) {
+ check_admin_referer( 'core-major-auto-updates-nonce' );
+
+ if ( 'enable' === $_GET['value'] ) {
+ update_site_option( 'auto_update_core_major', 'enabled' );
+ $redirect_url = add_query_arg( 'core-major-auto-updates-saved', 'enabled', $redirect_url );
+ } elseif ( 'disable' === $_GET['value'] ) {
+ update_site_option( 'auto_update_core_major', 'disabled' );
+ $redirect_url = add_query_arg( 'core-major-auto-updates-saved', 'disabled', $redirect_url );
+ }
+ }
+
+ wp_redirect( $redirect_url );
+ exit;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires for each custom update action on the WordPress Updates screen.
</span></span></pre>
</div>
</div>
</body>
</html>