--- a/wp/wp-admin/update-core.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/update-core.php Mon Oct 14 18:28:13 2019 +0200
@@ -19,11 +19,11 @@
exit();
}
-if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) )
+if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+}
/**
- *
* @global string $wp_local_package
* @global wpdb $wpdb
*
@@ -32,55 +32,74 @@
* @param object $update
*/
function list_core_update( $update ) {
- global $wp_local_package, $wpdb;
- static $first_pass = true;
+ global $wp_local_package, $wpdb;
+ static $first_pass = true;
$wp_version = get_bloginfo( 'version' );
- if ( 'en_US' == $update->locale && 'en_US' == get_locale() )
- $version_string = $update->current;
- // If the only available update is a partial builds, it doesn't need a language-specific version string.
- elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) )
- $version_string = $update->current;
- else
- $version_string = sprintf( "%s–<strong>%s</strong>", $update->current, $update->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 );
+ }
$current = false;
- if ( !isset($update->response) || 'latest' == $update->response )
+ if ( ! isset( $update->response ) || 'latest' == $update->response ) {
$current = true;
- $submit = __('Update Now');
- $form_action = 'update-core.php?action=do-core-upgrade';
- $php_version = phpversion();
- $mysql_version = $wpdb->db_version();
- $show_buttons = true;
+ }
+ $submit = __( 'Update Now' );
+ $form_action = 'update-core.php?action=do-core-upgrade';
+ $php_version = phpversion();
+ $mysql_version = $wpdb->db_version();
+ $show_buttons = true;
if ( 'development' == $update->response ) {
- $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically:');
+ $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' );
} else {
if ( $current ) {
- $message = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string );
- $submit = __('Re-install Now');
+ $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';
} else {
- $php_compat = version_compare( $php_version, $update->php_version, '>=' );
- if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+ $php_compat = version_compare( $php_version, $update->php_version, '>=' );
+ if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
$mysql_compat = true;
- else
+ } else {
$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
+ }
+
+ $version_url = sprintf(
+ /* 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() ) );
- if ( !$mysql_compat && !$php_compat )
- /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
- $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
- elseif ( !$php_compat )
- /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
- $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
- elseif ( !$mysql_compat )
- /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
- $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
- else
- /* translators: 1: WordPress version number, 2: WordPress version number including locale if necessary */
- $message = sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically:'), $update->current, $version_string);
- if ( !$mysql_compat || !$php_compat )
+ $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;
+ } 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;
+ } 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 );
+ } 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 );
+ }
+ if ( ! $mysql_compat || ! $php_compat ) {
$show_buttons = false;
+ }
}
}
@@ -88,10 +107,10 @@
echo $message;
echo '</p>';
echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
- wp_nonce_field('upgrade-core');
+ wp_nonce_field( 'upgrade-core' );
echo '<p>';
- echo '<input name="version" value="'. esc_attr($update->current) .'" type="hidden"/>';
- echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
+ echo '<input name="version" value="' . esc_attr( $update->current ) . '" type="hidden"/>';
+ echo '<input name="locale" value="' . esc_attr( $update->locale ) . '" type="hidden"/>';
if ( $show_buttons ) {
if ( $first_pass ) {
submit_button( $submit, $current ? '' : 'primary regular', 'upgrade', false );
@@ -100,17 +119,19 @@
submit_button( $submit, '', 'upgrade', false );
}
}
- if ( 'en_US' != $update->locale )
- if ( !isset( $update->dismissed ) || !$update->dismissed )
+ if ( 'en_US' != $update->locale ) {
+ if ( ! isset( $update->dismissed ) || ! $update->dismissed ) {
submit_button( __( 'Hide this update' ), '', 'dismiss', false );
- else
+ } else {
submit_button( __( 'Bring back this update' ), '', 'undismiss', false );
+ }
+ }
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>';
- // Partial builds don't need language-specific warnings.
- elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
- 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>';
+ 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 ) ) {
+ // 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 '</form>';
@@ -120,24 +141,28 @@
* @since 2.7.0
*/
function dismissed_updates() {
- $dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) );
+ $dismissed = get_core_updates(
+ array(
+ 'dismissed' => true,
+ 'available' => false,
+ )
+ );
if ( $dismissed ) {
- $show_text = esc_js(__('Show hidden updates'));
- $hide_text = esc_js(__('Hide hidden updates'));
- ?>
+ $show_text = esc_js( __( 'Show hidden updates' ) );
+ $hide_text = esc_js( __( 'Hide hidden updates' ) );
+ ?>
<script type="text/javascript">
-
- jQuery(function($) {
- $('dismissed-updates').show();
- $('#show-dismissed').toggle(function(){$(this).text('<?php echo $hide_text; ?>');}, function() {$(this).text('<?php echo $show_text; ?>')});
- $('#show-dismissed').click(function() { $('#dismissed-updates').toggle('slow');});
+ jQuery(function( $ ) {
+ $( 'dismissed-updates' ).show();
+ $( '#show-dismissed' ).toggle( function() { $( this ).text( '<?php echo $hide_text; ?>' ).attr( 'aria-expanded', 'true' ); }, function() { $( this ).text( '<?php echo $show_text; ?>' ).attr( 'aria-expanded', 'false' ); } );
+ $( '#show-dismissed' ).click( function() { $( '#dismissed-updates' ).toggle( 'fast' ); } );
});
</script>
- <?php
- echo '<p class="hide-if-no-js"><a id="show-dismissed" href="#">'.__('Show hidden updates').'</a></p>';
+ <?php
+ echo '<p class="hide-if-no-js"><button type="button" class="button" id="show-dismissed" aria-expanded="false">' . __( 'Show hidden updates' ) . '</button></p>';
echo '<ul id="dismissed-updates" class="core-updates dismissed">';
- foreach ( (array) $dismissed as $update) {
+ foreach ( (array) $dismissed as $update ) {
echo '<li>';
list_core_update( $update );
echo '</li>';
@@ -158,29 +183,30 @@
global $required_php_version, $required_mysql_version;
$wp_version = get_bloginfo( 'version' );
- $updates = get_core_updates();
+ $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.');
+ _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;
+ $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 )
+ $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>';
} else {
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.');
+ _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.' );
echo '</p></div>';
echo '<h2 class="response">';
@@ -210,16 +236,16 @@
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>';
} elseif ( ! $updates ) {
list( $normalized_version ) = explode( '-', $wp_version );
- echo '<p>' . sprintf( __( '<a href="%s">Learn more about WordPress %s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
+ echo '<p>' . sprintf( __( '<a href="%1$s">Learn more about WordPress %2$s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
}
dismissed_updates();
}
function list_plugin_updates() {
- $wp_version = get_bloginfo( 'version' );
+ $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>';
@@ -229,16 +255,17 @@
$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
+ } else {
$core_update_version = $core_updates[0]->current;
+ }
?>
<h2><?php _e( 'Plugins' ); ?></h2>
<p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click “Update Plugins”.' ); ?></p>
<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-plugins" class="upgrade">
-<?php wp_nonce_field('upgrade-core'); ?>
-<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
+ <?php wp_nonce_field( 'upgrade-core' ); ?>
+<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
<table class="widefat updates-table" id="update-plugins-table">
<thead>
<tr>
@@ -248,48 +275,61 @@
</thead>
<tbody class="plugins">
-<?php
+ <?php
foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
$plugin_data = (object) _get_plugin_data_markup_translate( $plugin_file, (array) $plugin_data, false, true );
- $icon = '<span class="dashicons dashicons-admin-plugins"></span>';
- $preferred_icons = array( 'svg', '1x', '2x', 'default' );
+ $icon = '<span class="dashicons dashicons-admin-plugins"></span>';
+ $preferred_icons = array( 'svg', '2x', '1x', 'default' );
foreach ( $preferred_icons as $preferred_icon ) {
if ( ! empty( $plugin_data->update->icons[ $preferred_icon ] ) ) {
$icon = '<img src="' . esc_url( $plugin_data->update->icons[ $preferred_icon ] ) . '" alt="" />';
break;
- }
+ }
}
// 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);
- } elseif ( isset($plugin_data->update->compatibility->{$cur_wp_version}) ) {
- $compat = $plugin_data->update->compatibility->{$cur_wp_version};
- $compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $cur_wp_version, $compat->percent, $compat->votes, $compat->total_votes);
+ 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 );
} else {
- $compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: Unknown'), $cur_wp_version);
+ $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$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 );
- } elseif ( isset( $plugin_data->update->compatibility->{$core_update_version} ) ) {
- $update_compat = $plugin_data->update->compatibility->{$core_update_version};
- $compat .= '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $core_update_version, $update_compat->percent, $update_compat->votes, $update_compat->total_votes);
} else {
- $compat .= '<br />' . sprintf(__('Compatibility with WordPress %1$s: Unknown'), $core_update_version);
+ $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
}
}
+
+ $requires_php = isset( $plugin_data->update->requires_php ) ? $plugin_data->update->requires_php : null;
+ $compatible_php = is_php_version_compatible( $requires_php );
+
+ 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(
+ __( '<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>';
+ }
+ }
+
// Get the upgrade notice for the new plugin version.
- if ( isset($plugin_data->update->upgrade_notice) ) {
- $upgrade_notice = '<br />' . strip_tags($plugin_data->update->upgrade_notice);
+ if ( isset( $plugin_data->update->upgrade_notice ) ) {
+ $upgrade_notice = '<br />' . strip_tags( $plugin_data->update->upgrade_notice );
} else {
$upgrade_notice = '';
}
- $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662');
- $details = sprintf(
+ $details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662' );
+ $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 */
@@ -298,34 +338,40 @@
sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
);
- $checkbox_id = "checkbox_" . md5( $plugin_data->Name );
+ $checkbox_id = 'checkbox_' . md5( $plugin_data->Name );
?>
- <tr>
- <td class="check-column">
- <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>
- </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( __( 'You have version %1$s installed. Update to %2$s.' ),
- $plugin_data->Version,
- $plugin_data->update->new_version
- );
- echo ' ' . $details . $compat . $upgrade_notice;
- ?>
- </p></td>
- </tr>
+ <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; ?>
+ </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(
+ __( 'You have version %1$s installed. Update to %2$s.' ),
+ $plugin_data->Version,
+ $plugin_data->update->new_version
+ );
+ echo ' ' . $details . $compat . $upgrade_notice;
+ ?>
+ </p></td>
+ </tr>
<?php
}
-?>
+ ?>
</tbody>
<tfoot>
@@ -335,9 +381,9 @@
</tr>
</tfoot>
</table>
-<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
+<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
</form>
-<?php
+ <?php
}
/**
@@ -352,13 +398,21 @@
}
$form_action = 'update-core.php?action=do-theme-upgrade';
-?>
+ ?>
<h2><?php _e( 'Themes' ); ?></h2>
<p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click “Update Themes”.' ); ?></p>
-<p><?php printf( __( '<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://codex.wordpress.org/Child_Themes' ) ); ?></p>
+<p>
+ <?php
+ printf(
+ /* 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/' )
+ );
+ ?>
+</p>
<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
-<?php wp_nonce_field('upgrade-core'); ?>
-<p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
+ <?php wp_nonce_field( 'upgrade-core' ); ?>
+<p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
<table class="widefat updates-table" id="update-themes-table">
<thead>
<tr>
@@ -368,35 +422,39 @@
</thead>
<tbody class="plugins">
-<?php
+ <?php
foreach ( $themes as $stylesheet => $theme ) {
$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>
- </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( __( 'You have version %1$s installed. Update to %2$s.' ),
- $theme->display( 'Version' ),
- $theme->update['new_version']
- );
- ?>
- </p></td>
- </tr>
- <?php
+ <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>
+ </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(
+ __( 'You have version %1$s installed. Update to %2$s.' ),
+ $theme->display( 'Version' ),
+ $theme->update['new_version']
+ );
+ ?>
+ </p></td>
+ </tr>
+ <?php
}
-?>
+ ?>
</tbody>
<tfoot>
@@ -406,9 +464,9 @@
</tr>
</tfoot>
</table>
-<p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
+<p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
</form>
-<?php
+ <?php
}
/**
@@ -440,7 +498,7 @@
*
* @since 2.7.0
*
- * @global WP_Filesystem_Base $wp_filesystem Subclass
+ * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
*
* @param bool $reinstall
*/
@@ -449,26 +507,28 @@
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
- if ( $reinstall )
+ if ( $reinstall ) {
$url = 'update-core.php?action=do-core-reinstall';
- else
+ } else {
$url = 'update-core.php?action=do-core-upgrade';
- $url = wp_nonce_url($url, 'upgrade-core');
+ }
+ $url = wp_nonce_url( $url, 'upgrade-core' );
- $version = isset( $_POST['version'] )? $_POST['version'] : false;
- $locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
- $update = find_core_update( $version, $locale );
- if ( !$update )
+ $version = isset( $_POST['version'] ) ? $_POST['version'] : false;
+ $locale = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
+ $update = find_core_update( $version, $locale );
+ if ( ! $update ) {
return;
+ }
// Allow relaxed file ownership writes for User-initiated upgrades when the API specifies
// that it's safe to do so. This only happens when there are no new files to create.
$allow_relaxed_file_ownership = ! $reinstall && isset( $update->new_files ) && ! $update->new_files;
-?>
+ ?>
<div class="wrap">
<h1><?php _e( 'Update WordPress' ); ?></h1>
-<?php
+ <?php
if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
echo '</div>';
@@ -482,32 +542,38 @@
return;
}
- if ( $wp_filesystem->errors->get_error_code() ) {
- foreach ( $wp_filesystem->errors->get_error_messages() as $message )
- show_message($message);
+ if ( $wp_filesystem->errors->has_errors() ) {
+ foreach ( $wp_filesystem->errors->get_error_messages() as $message ) {
+ show_message( $message );
+ }
echo '</div>';
return;
}
- if ( $reinstall )
+ if ( $reinstall ) {
$update->response = 'reinstall';
+ }
add_filter( 'update_feedback', 'show_message' );
$upgrader = new Core_Upgrader();
- $result = $upgrader->upgrade( $update, array(
- 'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership
- ) );
+ $result = $upgrader->upgrade(
+ $update,
+ array(
+ 'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
+ )
+ );
- 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') );
+ 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' ) );
+ }
echo '</div>';
return;
}
- show_message( __('WordPress updated successfully') );
+ 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>' );
?>
@@ -522,13 +588,14 @@
* @since 2.7.0
*/
function do_dismiss_core_update() {
- $version = isset( $_POST['version'] )? $_POST['version'] : false;
- $locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
- $update = find_core_update( $version, $locale );
- if ( !$update )
+ $version = isset( $_POST['version'] ) ? $_POST['version'] : false;
+ $locale = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
+ $update = find_core_update( $version, $locale );
+ if ( ! $update ) {
return;
+ }
dismiss_core_update( $update );
- wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
+ wp_redirect( wp_nonce_url( 'update-core.php?action=upgrade-core', 'upgrade-core' ) );
exit;
}
@@ -536,36 +603,39 @@
* @since 2.7.0
*/
function do_undismiss_core_update() {
- $version = isset( $_POST['version'] )? $_POST['version'] : false;
- $locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
- $update = find_core_update( $version, $locale );
- if ( !$update )
+ $version = isset( $_POST['version'] ) ? $_POST['version'] : false;
+ $locale = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
+ $update = find_core_update( $version, $locale );
+ if ( ! $update ) {
return;
+ }
undismiss_core_update( $version, $locale );
- wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
+ wp_redirect( wp_nonce_url( 'update-core.php?action=upgrade-core', 'upgrade-core' ) );
exit;
}
-$action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core';
+$action = isset( $_GET['action'] ) ? $_GET['action'] : 'upgrade-core';
$upgrade_error = false;
if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) )
&& ! isset( $_POST['checked'] ) ) {
$upgrade_error = $action == 'do-theme-upgrade' ? 'themes' : 'plugins';
- $action = 'upgrade-core';
+ $action = 'upgrade-core';
}
-$title = __('WordPress Updates');
+$title = __( 'WordPress Updates' );
$parent_file = 'index.php';
$updates_overview = '<p>' . __( 'On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations from the WordPress.org repositories.' ) . '</p>';
$updates_overview .= '<p>' . __( 'If an update is available, you᾿ll see a notification appear in the Toolbar and navigation menu.' ) . ' ' . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' ) . '</p>';
-get_current_screen()->add_help_tab( array(
- 'id' => 'overview',
- 'title' => __( 'Overview' ),
- 'content' => $updates_overview
-) );
+get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' ),
+ 'content' => $updates_overview,
+ )
+);
$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>';
@@ -574,16 +644,18 @@
$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>';
}
-get_current_screen()->add_help_tab( array(
- 'id' => 'how-to-update',
- 'title' => __( 'How to Update' ),
- 'content' => $updates_howto
-) );
+get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'how-to-update',
+ 'title' => __( 'How to Update' ),
+ 'content' => $updates_howto,
+ )
+);
get_current_screen()->set_help_sidebar(
- '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<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/">Support Forums</a>' ) . '</p>'
+ '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
);
if ( 'upgrade-core' == $action ) {
@@ -591,31 +663,32 @@
$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' )
- _e('Please select one or more themes to update.');
- else
- _e('Please select one or more plugins to update.');
+ if ( $upgrade_error == 'themes' ) {
+ _e( 'Please select one or more themes to update.' );
+ } else {
+ _e( 'Please select one or more plugins to update.' );
+ }
echo '</p></div>';
}
$last_update_check = false;
- $current = get_site_transient( 'update_core' );
+ $current = get_site_transient( 'update_core' );
- if ( $current && isset ( $current->last_checked ) ) {
+ if ( $current && isset( $current->last_checked ) ) {
$last_update_check = $current->last_checked + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
}
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 ' <a class="button" href="' . esc_url( self_admin_url( 'update-core.php?force-check=1' ) ) . '">' . __( 'Check Again' ) . '</a>';
echo '</p>';
if ( current_user_can( 'update_core' ) ) {
@@ -639,129 +712,156 @@
do_action( 'core_upgrade_preamble' );
echo '</div>';
- wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
- 'totals' => wp_get_update_data(),
- ) );
+ wp_localize_script(
+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
+ 'totals' => wp_get_update_data(),
+ )
+ );
- include(ABSPATH . 'wp-admin/admin-footer.php');
+ include( ABSPATH . 'wp-admin/admin-footer.php' );
} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
- if ( ! current_user_can( 'update_core' ) )
+ if ( ! current_user_can( 'update_core' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+ }
- check_admin_referer('upgrade-core');
+ check_admin_referer( 'upgrade-core' );
// Do the (un)dismiss actions before headers, so that they can redirect.
- if ( isset( $_POST['dismiss'] ) )
+ if ( isset( $_POST['dismiss'] ) ) {
do_dismiss_core_update();
- elseif ( isset( $_POST['undismiss'] ) )
+ } elseif ( isset( $_POST['undismiss'] ) ) {
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
+ } else {
$reinstall = false;
+ }
- if ( isset( $_POST['upgrade'] ) )
- do_core_upgrade($reinstall);
+ if ( isset( $_POST['upgrade'] ) ) {
+ do_core_upgrade( $reinstall );
+ }
- wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
- 'totals' => wp_get_update_data(),
- ) );
+ wp_localize_script(
+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
+ 'totals' => wp_get_update_data(),
+ )
+ );
- include(ABSPATH . 'wp-admin/admin-footer.php');
+ include( ABSPATH . 'wp-admin/admin-footer.php' );
} elseif ( 'do-plugin-upgrade' == $action ) {
- if ( ! current_user_can( 'update_plugins' ) )
+ if ( ! current_user_can( 'update_plugins' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+ }
- check_admin_referer('upgrade-core');
+ check_admin_referer( 'upgrade-core' );
if ( isset( $_GET['plugins'] ) ) {
$plugins = explode( ',', $_GET['plugins'] );
} elseif ( isset( $_POST['checked'] ) ) {
$plugins = (array) $_POST['checked'];
} else {
- wp_redirect( admin_url('update-core.php') );
+ wp_redirect( admin_url( 'update-core.php' ) );
exit;
}
- $url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
- $url = wp_nonce_url($url, 'bulk-update-plugins');
+ $url = 'update.php?action=update-selected&plugins=' . urlencode( implode( ',', $plugins ) );
+ $url = wp_nonce_url( $url, 'bulk-update-plugins' );
- $title = __('Update Plugins');
+ $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>';
echo '</div>';
- wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
- 'totals' => wp_get_update_data(),
- ) );
+ wp_localize_script(
+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
+ 'totals' => wp_get_update_data(),
+ )
+ );
- include(ABSPATH . 'wp-admin/admin-footer.php');
+ include( ABSPATH . 'wp-admin/admin-footer.php' );
} elseif ( 'do-theme-upgrade' == $action ) {
- if ( ! current_user_can( 'update_themes' ) )
+ if ( ! current_user_can( 'update_themes' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+ }
- check_admin_referer('upgrade-core');
+ check_admin_referer( 'upgrade-core' );
if ( isset( $_GET['themes'] ) ) {
$themes = explode( ',', $_GET['themes'] );
} elseif ( isset( $_POST['checked'] ) ) {
$themes = (array) $_POST['checked'];
} else {
- wp_redirect( admin_url('update-core.php') );
+ wp_redirect( admin_url( 'update-core.php' ) );
exit;
}
- $url = 'update.php?action=update-selected-themes&themes=' . urlencode(implode(',', $themes));
- $url = wp_nonce_url($url, 'bulk-update-themes');
+ $url = 'update.php?action=update-selected-themes&themes=' . urlencode( implode( ',', $themes ) );
+ $url = wp_nonce_url( $url, 'bulk-update-themes' );
- $title = __('Update Themes');
+ $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>
- <iframe src="<?php echo $url ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e( 'Update progress' ); ?>"></iframe>
+ <iframe src="<?php echo $url; ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e( 'Update progress' ); ?>"></iframe>
</div>
<?php
- wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
- 'totals' => wp_get_update_data(),
- ) );
+ wp_localize_script(
+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
+ 'totals' => wp_get_update_data(),
+ )
+ );
- include(ABSPATH . 'wp-admin/admin-footer.php');
+ include( ABSPATH . 'wp-admin/admin-footer.php' );
} elseif ( 'do-translation-upgrade' == $action ) {
- if ( ! current_user_can( 'update_languages' ) )
+ if ( ! current_user_can( 'update_languages' ) ) {
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+ }
check_admin_referer( 'upgrade-translations' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
- $url = 'update-core.php?action=do-translation-upgrade';
- $nonce = 'upgrade-translations';
- $title = __( 'Update Translations' );
+ $url = 'update-core.php?action=do-translation-upgrade';
+ $nonce = 'upgrade-translations';
+ $title = __( 'Update Translations' );
$context = WP_LANG_DIR;
$upgrader = new Language_Pack_Upgrader( new Language_Pack_Upgrader_Skin( compact( 'url', 'nonce', 'title', 'context' ) ) );
- $result = $upgrader->bulk_upgrade();
+ $result = $upgrader->bulk_upgrade();
- wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
- 'totals' => wp_get_update_data(),
- ) );
+ wp_localize_script(
+ 'updates',
+ '_wpUpdatesItemCounts',
+ array(
+ 'totals' => wp_get_update_data(),
+ )
+ );
require_once( ABSPATH . 'wp-admin/admin-footer.php' );