--- a/wp/wp-admin/update-core.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/update-core.php Tue Dec 15 13:49:49 2020 +0100
@@ -7,7 +7,7 @@
*/
/** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once __DIR__ . '/admin.php';
wp_enqueue_style( 'plugin-install' );
wp_enqueue_script( 'plugin-install' );
@@ -16,7 +16,7 @@
if ( is_multisite() && ! is_network_admin() ) {
wp_redirect( network_admin_url( 'update-core.php' ) );
- exit();
+ exit;
}
if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) ) {
@@ -24,10 +24,12 @@
}
/**
- * @global string $wp_local_package
- * @global wpdb $wpdb
+ * Lists available core updates.
*
- * @staticvar bool $first_pass
+ * @since 2.7.0
+ *
+ * @global string $wp_local_package Locale code of the package.
+ * @global wpdb $wpdb WordPress database abstraction object.
*
* @param object $update
*/
@@ -35,19 +37,21 @@
global $wp_local_package, $wpdb;
static $first_pass = true;
- $wp_version = get_bloginfo( 'version' );
+ $wp_version = get_bloginfo( 'version' );
+ $version_string = sprintf( '%s–<strong>%s</strong>', $update->current, $update->locale );
- if ( 'en_US' == $update->locale && 'en_US' == get_locale() ) {
+ if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) {
$version_string = $update->current;
- } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) {
- // If the only available update is a partial builds, it doesn't need a language-specific version string.
- $version_string = $update->current;
- } else {
- $version_string = sprintf( '%s–<strong>%s</strong>', $update->current, $update->locale );
+ } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {
+ $updates = get_core_updates();
+ if ( $updates && 1 === count( $updates ) ) {
+ // If the only available update is a partial builds, it doesn't need a language-specific version string.
+ $version_string = $update->current;
+ }
}
$current = false;
- if ( ! isset( $update->response ) || 'latest' == $update->response ) {
+ if ( ! isset( $update->response ) || 'latest' === $update->response ) {
$current = true;
}
$submit = __( 'Update Now' );
@@ -55,10 +59,11 @@
$php_version = phpversion();
$mysql_version = $wpdb->db_version();
$show_buttons = true;
- if ( 'development' == $update->response ) {
+ if ( 'development' === $update->response ) {
$message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' );
} else {
if ( $current ) {
+ /* translators: %s: WordPress version. */
$message = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string );
$submit = __( 'Re-install Now' );
$form_action = 'update-core.php?action=do-core-reinstall';
@@ -71,31 +76,59 @@
}
$version_url = sprintf(
- /* translators: %s: WordPress version */
+ /* translators: %s: WordPress version. */
esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
sanitize_title( $update->current )
);
- /* translators: %s: Update PHP page URL */
- $php_update_message = '</p><p>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
+ $php_update_message = '</p><p>' . sprintf(
+ /* translators: %s: URL to Update PHP page. */
+ __( '<a href="%s">Learn more about updating PHP</a>.' ),
+ esc_url( wp_get_update_php_url() )
+ );
$annotation = wp_get_update_php_annotation();
+
if ( $annotation ) {
$php_update_message .= '</p><p><em>' . $annotation . '</em>';
}
if ( ! $mysql_compat && ! $php_compat ) {
- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ) . $php_update_message;
+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number. */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ),
+ $version_url,
+ $update->current,
+ $update->php_version,
+ $update->mysql_version,
+ $php_version,
+ $mysql_version
+ ) . $php_update_message;
} elseif ( ! $php_compat ) {
- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->php_version, $php_version ) . $php_update_message;
+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number. */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ),
+ $version_url,
+ $update->current,
+ $update->php_version,
+ $php_version
+ ) . $php_update_message;
} elseif ( ! $mysql_compat ) {
- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->mysql_version, $mysql_version );
+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number. */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ),
+ $version_url,
+ $update->current,
+ $update->mysql_version,
+ $mysql_version
+ );
} else {
- /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary */
- $message = sprintf( __( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ), $version_url, $version_string );
+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary. */
+ __( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ),
+ $version_url,
+ $version_string
+ );
}
if ( ! $mysql_compat || ! $php_compat ) {
$show_buttons = false;
@@ -119,7 +152,7 @@
submit_button( $submit, '', 'upgrade', false );
}
}
- if ( 'en_US' != $update->locale ) {
+ if ( 'en_US' !== $update->locale ) {
if ( ! isset( $update->dismissed ) || ! $update->dismissed ) {
submit_button( __( 'Hide this update' ), '', 'dismiss', false );
} else {
@@ -127,17 +160,23 @@
}
}
echo '</p>';
- if ( 'en_US' != $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
- 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>';
- } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
+ if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
+ echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>';
+ } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
// Partial builds don't need language-specific warnings.
- 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>';
+ echo '<p class="hint">' . sprintf(
+ /* translators: %s: WordPress version. */
+ __( '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.' ),
+ 'development' !== $update->response ? $update->current : ''
+ ) . '</p>';
}
echo '</form>';
}
/**
+ * Display dismissed updates.
+ *
* @since 2.7.0
*/
function dismissed_updates() {
@@ -176,8 +215,8 @@
*
* @since 2.7.0
*
- * @global string $required_php_version
- * @global string $required_mysql_version
+ * @global string $required_php_version The required PHP version string.
+ * @global string $required_mysql_version The required MySQL version string.
*/
function core_upgrade_preamble() {
global $required_php_version, $required_mysql_version;
@@ -185,7 +224,7 @@
$wp_version = get_bloginfo( 'version' );
$updates = get_core_updates();
- if ( ! isset( $updates[0]->response ) || 'latest' == $updates[0]->response ) {
+ if ( ! isset( $updates[0]->response ) || 'latest' === $updates[0]->response ) {
echo '<h2>';
_e( 'You have the latest version of WordPress.' );
@@ -204,9 +243,16 @@
}
}
echo '</h2>';
- } else {
+ }
+
+ if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
echo '<div class="notice notice-warning"><p>';
- _e( '<strong>Important:</strong> Before updating, please <a href="https://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="https://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.' );
+ printf(
+ /* translators: 1: Documentation on WordPress backups, 2: Documentation on updating WordPress. */
+ __( '<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.' ),
+ __( 'https://wordpress.org/support/article/wordpress-backups/' ),
+ __( 'https://wordpress.org/support/article/updating-wordpress/' )
+ );
echo '</p></div>';
echo '<h2 class="response">';
@@ -214,7 +260,7 @@
echo '</h2>';
}
- if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
+ 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 ) ) {
@@ -232,20 +278,30 @@
}
echo '</ul>';
// Don't show the maintenance mode notice when we are only showing a single re-install option.
- if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) {
- echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>';
+ if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) {
+ echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, this mode will be deactivated.' ) . '</p>';
} elseif ( ! $updates ) {
list( $normalized_version ) = explode( '-', $wp_version );
- echo '<p>' . sprintf( __( '<a href="%1$s">Learn more about WordPress %2$s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
+ echo '<p>' . sprintf(
+ /* translators: 1: URL to About screen, 2: WordPress version. */
+ __( '<a href="%1$s">Learn more about WordPress %2$s</a>.' ),
+ esc_url( self_admin_url( 'about.php' ) ),
+ $normalized_version
+ ) . '</p>';
}
dismissed_updates();
}
+/**
+ * Display the upgrade plugins form.
+ *
+ * @since 2.9.0
+ */
function list_plugin_updates() {
$wp_version = get_bloginfo( 'version' );
$cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
- require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+ require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
$plugins = get_plugin_updates();
if ( empty( $plugins ) ) {
echo '<h2>' . __( 'Plugins' ) . '</h2>';
@@ -255,7 +311,7 @@
$form_action = 'update-core.php?action=do-plugin-upgrade';
$core_updates = get_core_updates();
- if ( ! isset( $core_updates[0]->response ) || 'latest' == $core_updates[0]->response || 'development' == $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) {
+ if ( ! isset( $core_updates[0]->response ) || 'latest' === $core_updates[0]->response || 'development' === $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) {
$core_update_version = false;
} else {
$core_update_version = $core_updates[0]->current;
@@ -276,6 +332,13 @@
<tbody class="plugins">
<?php
+
+ $auto_updates = array();
+ if ( wp_is_auto_update_enabled_for_type( 'plugin' ) ) {
+ $auto_updates = (array) get_site_option( 'auto_update_plugins', array() );
+ $auto_update_notice = ' | ' . wp_get_auto_update_message();
+ }
+
foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
$plugin_data = (object) _get_plugin_data_markup_translate( $plugin_file, (array) $plugin_data, false, true );
@@ -290,16 +353,20 @@
// Get plugin compat for running version of WordPress.
if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
- $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $cur_wp_version );
+ /* translators: %s: WordPress version. */
+ $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $cur_wp_version );
} else {
- $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $cur_wp_version );
+ /* translators: %s: WordPress version. */
+ $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $cur_wp_version );
}
// Get plugin compat for updated version of WordPress.
if ( $core_update_version ) {
if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
- $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version );
+ /* translators: %s: WordPress version. */
+ $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $core_update_version );
} else {
- $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
+ /* translators: %s: WordPress version. */
+ $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $core_update_version );
}
}
@@ -308,8 +375,8 @@
if ( ! $compatible_php && current_user_can( 'update_php' ) ) {
$compat .= '<br>' . __( 'This update doesn’t work with your version of PHP.' ) . ' ';
- /* translators: %s: Update PHP page URL */
$compat .= sprintf(
+ /* translators: %s: URL to Update PHP page. */
__( '<a href="%s">Learn more about updating PHP</a>.' ),
esc_url( wp_get_update_php_url() )
);
@@ -332,9 +399,9 @@
$details = sprintf(
'<a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
esc_url( $details_url ),
- /* translators: 1: plugin name, 2: version number */
+ /* translators: 1: Plugin name, 2: Version number. */
esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
- /* translators: %s: plugin version */
+ /* translators: %s: Plugin version. */
sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
);
@@ -342,34 +409,36 @@
?>
<tr>
<td class="check-column">
- <?php if ( $compatible_php ) : ?>
- <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
- <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
- <?php
- /* translators: %s: plugin name */
- printf(
- __( 'Select %s' ),
- $plugin_data->Name
- );
- ?>
- </label>
- <?php endif; ?>
+ <?php if ( $compatible_php ) : ?>
+ <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
+ <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
+ <?php
+ /* translators: %s: Plugin name. */
+ printf( __( 'Select %s' ), $plugin_data->Name );
+ ?>
+ </label>
+ <?php endif; ?>
</td>
<td class="plugin-title"><p>
<?php echo $icon; ?>
<strong><?php echo $plugin_data->Name; ?></strong>
<?php
- /* translators: 1: plugin version, 2: new version */
printf(
+ /* translators: 1: Plugin version, 2: New version. */
__( 'You have version %1$s installed. Update to %2$s.' ),
$plugin_data->Version,
$plugin_data->update->new_version
);
+
echo ' ' . $details . $compat . $upgrade_notice;
+
+ if ( in_array( $plugin_file, $auto_updates, true ) ) {
+ echo $auto_update_notice;
+ }
?>
</p></td>
</tr>
- <?php
+ <?php
}
?>
</tbody>
@@ -387,6 +456,8 @@
}
/**
+ * Display the upgrade themes form.
+ *
* @since 2.9.0
*/
function list_theme_updates() {
@@ -404,7 +475,7 @@
<p>
<?php
printf(
- /* translators: %s: link to documentation on child themes */
+ /* translators: %s: Link to documentation on child themes. */
__( '<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.' ),
__( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' )
);
@@ -423,32 +494,111 @@
<tbody class="plugins">
<?php
+ $auto_updates = array();
+ if ( wp_is_auto_update_enabled_for_type( 'theme' ) ) {
+ $auto_updates = (array) get_site_option( 'auto_update_themes', array() );
+ $auto_update_notice = ' | ' . wp_get_auto_update_message();
+ }
+
foreach ( $themes as $stylesheet => $theme ) {
+ $requires_wp = isset( $theme->update['requires'] ) ? $theme->update['requires'] : null;
+ $requires_php = isset( $theme->update['requires_php'] ) ? $theme->update['requires_php'] : null;
+
+ $compatible_wp = is_wp_version_compatible( $requires_wp );
+ $compatible_php = is_php_version_compatible( $requires_php );
+
+ $compat = '';
+
+ if ( ! $compatible_wp && ! $compatible_php ) {
+ $compat .= '<br>' . __( 'This update doesn’t work with your versions of WordPress and PHP.' ) . ' ';
+ if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+ $compat .= sprintf(
+ /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
+ __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
+ self_admin_url( 'update-core.php' ),
+ esc_url( wp_get_update_php_url() )
+ );
+
+ $annotation = wp_get_update_php_annotation();
+
+ if ( $annotation ) {
+ $compat .= '</p><p><em>' . $annotation . '</em>';
+ }
+ } elseif ( current_user_can( 'update_core' ) ) {
+ $compat .= sprintf(
+ /* translators: %s: URL to WordPress Updates screen. */
+ __( '<a href="%s">Please update WordPress</a>.' ),
+ self_admin_url( 'update-core.php' )
+ );
+ } elseif ( current_user_can( 'update_php' ) ) {
+ $compat .= sprintf(
+ /* translators: %s: URL to Update PHP page. */
+ __( '<a href="%s">Learn more about updating PHP</a>.' ),
+ esc_url( wp_get_update_php_url() )
+ );
+
+ $annotation = wp_get_update_php_annotation();
+
+ if ( $annotation ) {
+ $compat .= '</p><p><em>' . $annotation . '</em>';
+ }
+ }
+ } elseif ( ! $compatible_wp ) {
+ $compat .= '<br>' . __( 'This update doesn’t work with your version of WordPress.' ) . ' ';
+ if ( current_user_can( 'update_core' ) ) {
+ $compat .= sprintf(
+ /* translators: %s: URL to WordPress Updates screen. */
+ __( '<a href="%s">Please update WordPress</a>.' ),
+ self_admin_url( 'update-core.php' )
+ );
+ }
+ } elseif ( ! $compatible_php ) {
+ $compat .= '<br>' . __( 'This update doesn’t work with your version of PHP.' ) . ' ';
+ if ( current_user_can( 'update_php' ) ) {
+ $compat .= sprintf(
+ /* translators: %s: URL to Update PHP page. */
+ __( '<a href="%s">Learn more about updating PHP</a>.' ),
+ esc_url( wp_get_update_php_url() )
+ );
+
+ $annotation = wp_get_update_php_annotation();
+
+ if ( $annotation ) {
+ $compat .= '</p><p><em>' . $annotation . '</em>';
+ }
+ }
+ }
+
$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
?>
<tr>
<td class="check-column">
- <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
- <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
- <?php
- /* translators: %s: theme name */
- printf(
- __( 'Select %s' ),
- $theme->display( 'Name' )
- );
- ?>
- </label>
+ <?php if ( $compatible_wp && $compatible_php ) : ?>
+ <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
+ <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
+ <?php
+ /* translators: %s: Theme name. */
+ printf( __( 'Select %s' ), $theme->display( 'Name' ) );
+ ?>
+ </label>
+ <?php endif; ?>
</td>
<td class="plugin-title"><p>
<img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
<strong><?php echo $theme->display( 'Name' ); ?></strong>
<?php
- /* translators: 1: theme version, 2: new version */
printf(
+ /* translators: 1: Theme version, 2: New version. */
__( 'You have version %1$s installed. Update to %2$s.' ),
$theme->display( 'Version' ),
$theme->update['new_version']
);
+
+ echo ' ' . $compat;
+
+ if ( in_array( $stylesheet, $auto_updates, true ) ) {
+ echo $auto_update_notice;
+ }
?>
</p></td>
</tr>
@@ -470,12 +620,14 @@
}
/**
+ * Display the update translations form.
+ *
* @since 3.7.0
*/
function list_translation_updates() {
$updates = wp_get_translation_updates();
if ( ! $updates ) {
- if ( 'en_US' != get_locale() ) {
+ if ( 'en_US' !== get_locale() ) {
echo '<h2>' . __( 'Translations' ) . '</h2>';
echo '<p>' . __( 'Your translations are all up to date.' ) . '</p>';
}
@@ -505,7 +657,7 @@
function do_core_upgrade( $reinstall = false ) {
global $wp_filesystem;
- include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+ require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
if ( $reinstall ) {
$url = 'update-core.php?action=do-core-reinstall';
@@ -530,13 +682,14 @@
<h1><?php _e( 'Update WordPress' ); ?></h1>
<?php
- if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
+ $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
+ if ( false === $credentials ) {
echo '</div>';
return;
}
if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
- // Failed to connect, Error and request again
+ // Failed to connect. Error and request again.
request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
echo '</div>';
return;
@@ -567,15 +720,29 @@
if ( is_wp_error( $result ) ) {
show_message( $result );
if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
- show_message( __( 'Installation Failed' ) );
+ show_message( __( 'Installation failed.' ) );
}
echo '</div>';
return;
}
- show_message( __( 'WordPress updated successfully' ) );
- show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
- show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
+ show_message( __( 'WordPress updated successfully.' ) );
+ show_message(
+ '<span class="hide-if-no-js">' . sprintf(
+ /* translators: 1: WordPress version, 2: URL to About screen. */
+ __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ),
+ $result,
+ esc_url( self_admin_url( 'about.php?updated' ) )
+ ) . '</span>'
+ );
+ show_message(
+ '<span class="hide-if-js">' . sprintf(
+ /* translators: 1: WordPress version, 2: URL to About screen. */
+ __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ),
+ $result,
+ esc_url( self_admin_url( 'about.php?updated' ) )
+ ) . '</span>'
+ );
?>
</div>
<script type="text/javascript">
@@ -585,6 +752,8 @@
}
/**
+ * Dismiss a core update.
+ *
* @since 2.7.0
*/
function do_dismiss_core_update() {
@@ -600,6 +769,8 @@
}
/**
+ * Undismiss a core update.
+ *
* @since 2.7.0
*/
function do_undismiss_core_update() {
@@ -617,9 +788,9 @@
$action = isset( $_GET['action'] ) ? $_GET['action'] : 'upgrade-core';
$upgrade_error = false;
-if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) )
+if ( ( 'do-theme-upgrade' === $action || ( 'do-plugin-upgrade' === $action && ! isset( $_GET['plugins'] ) ) )
&& ! isset( $_POST['checked'] ) ) {
- $upgrade_error = $action == 'do-theme-upgrade' ? 'themes' : 'plugins';
+ $upgrade_error = ( 'do-theme-upgrade' === $action ) ? 'themes' : 'plugins';
$action = 'upgrade-core';
}
@@ -640,7 +811,7 @@
$updates_howto = '<p>' . __( '<strong>WordPress</strong> — Updating your WordPress installation is a simple one-click procedure: just <strong>click on the “Update Now” button</strong> when you are notified that a new version is available.' ) . ' ' . __( 'In most cases, WordPress will automatically apply maintenance and security updates in the background for you.' ) . '</p>';
$updates_howto .= '<p>' . __( '<strong>Themes and Plugins</strong> — To update individual themes or plugins from this screen, use the checkboxes to make your selection, then <strong>click on the appropriate “Update” button</strong>. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.' ) . '</p>';
-if ( 'en_US' != get_locale() ) {
+if ( 'en_US' !== get_locale() ) {
$updates_howto .= '<p>' . __( '<strong>Translations</strong> — The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can <strong>click the “Update Translations”</strong> button.' ) . '</p>';
}
@@ -652,25 +823,43 @@
)
);
+$help_sidebar_autoupdates = '';
+
+if ( ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type( 'theme' ) ) || ( current_user_can( 'update_plugins' ) && wp_is_auto_update_enabled_for_type( 'plugin' ) ) ) {
+ $help_tab_autoupdates = '<p>' . __( 'Auto-updates can be enabled or disabled for each individual theme or plugin. Themes or plugins with auto-updates enabled will display the estimated date of the next auto-update. Auto-updates depends on the WP-Cron task scheduling system.' ) . '</p>';
+ $help_tab_autoupdates .= '<p>' . __( 'Please note: Third-party themes and plugins, or custom code, may override WordPress scheduling.' ) . '</p>';
+
+ get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'plugins-themes-auto-updates',
+ 'title' => __( 'Auto-updates' ),
+ 'content' => $help_tab_autoupdates,
+ )
+ );
+
+ $help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>' ) . '</p>';
+}
+
get_current_screen()->set_help_sidebar(
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
- '<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Updates_Screen">Documentation on Updating WordPress</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/article/dashboard-updates-screen/">Documentation on Updating WordPress</a>' ) . '</p>' .
+ $help_sidebar_autoupdates .
'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
);
-if ( 'upgrade-core' == $action ) {
- // Force a update check when requested
+if ( 'upgrade-core' === $action ) {
+ // Force a update check when requested.
$force_check = ! empty( $_GET['force-check'] );
wp_version_check( array(), $force_check );
- require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ require_once ABSPATH . 'wp-admin/admin-header.php';
?>
<div class="wrap">
<h1><?php _e( 'WordPress Updates' ); ?></h1>
<?php
if ( $upgrade_error ) {
echo '<div class="error"><p>';
- if ( $upgrade_error == 'themes' ) {
+ if ( 'themes' === $upgrade_error ) {
_e( 'Please select one or more themes to update.' );
} else {
_e( 'Please select one or more plugins to update.' );
@@ -686,7 +875,7 @@
}
echo '<p>';
- /* translators: 1: date, 2: time */
+ /* translators: 1: Date, 2: Time. */
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 ) );
echo ' <a class="button" href="' . esc_url( self_admin_url( 'update-core.php?force-check=1' ) ) . '">' . __( 'Check Again' ) . '</a>';
echo '</p>';
@@ -720,9 +909,9 @@
)
);
- include( ABSPATH . 'wp-admin/admin-footer.php' );
+ require_once ABSPATH . 'wp-admin/admin-footer.php';
-} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
+} elseif ( 'do-core-upgrade' === $action || 'do-core-reinstall' === $action ) {
if ( ! current_user_can( 'update_core' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
@@ -737,8 +926,8 @@
do_undismiss_core_update();
}
- require_once( ABSPATH . 'wp-admin/admin-header.php' );
- if ( 'do-core-reinstall' == $action ) {
+ require_once ABSPATH . 'wp-admin/admin-header.php';
+ if ( 'do-core-reinstall' === $action ) {
$reinstall = true;
} else {
$reinstall = false;
@@ -756,9 +945,9 @@
)
);
- include( ABSPATH . 'wp-admin/admin-footer.php' );
+ require_once ABSPATH . 'wp-admin/admin-footer.php';
-} elseif ( 'do-plugin-upgrade' == $action ) {
+} elseif ( 'do-plugin-upgrade' === $action ) {
if ( ! current_user_can( 'update_plugins' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
@@ -780,7 +969,7 @@
$title = __( 'Update Plugins' );
- require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ require_once ABSPATH . 'wp-admin/admin-header.php';
echo '<div class="wrap">';
echo '<h1>' . __( 'Update Plugins' ) . '</h1>';
echo '<iframe src="', $url, '" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="' . esc_attr__( 'Update progress' ) . '"></iframe>';
@@ -794,9 +983,9 @@
)
);
- include( ABSPATH . 'wp-admin/admin-footer.php' );
+ require_once ABSPATH . 'wp-admin/admin-footer.php';
-} elseif ( 'do-theme-upgrade' == $action ) {
+} elseif ( 'do-theme-upgrade' === $action ) {
if ( ! current_user_can( 'update_themes' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
@@ -818,7 +1007,7 @@
$title = __( 'Update Themes' );
- require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ require_once ABSPATH . 'wp-admin/admin-header.php';
?>
<div class="wrap">
<h1><?php _e( 'Update Themes' ); ?></h1>
@@ -834,9 +1023,9 @@
)
);
- include( ABSPATH . 'wp-admin/admin-footer.php' );
+ require_once ABSPATH . 'wp-admin/admin-footer.php';
-} elseif ( 'do-translation-upgrade' == $action ) {
+} elseif ( 'do-translation-upgrade' === $action ) {
if ( ! current_user_can( 'update_languages' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
@@ -844,8 +1033,8 @@
check_admin_referer( 'upgrade-translations' );
- require_once( ABSPATH . 'wp-admin/admin-header.php' );
- include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+ require_once ABSPATH . 'wp-admin/admin-header.php';
+ require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
$url = 'update-core.php?action=do-translation-upgrade';
$nonce = 'upgrade-translations';
@@ -863,7 +1052,7 @@
)
);
- require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+ require_once ABSPATH . 'wp-admin/admin-footer.php';
} else {
/**
@@ -875,5 +1064,5 @@
*
* @since 3.2.0
*/
- do_action( "update-core-custom_{$action}" );
+ do_action( "update-core-custom_{$action}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
}