--- a/wp/wp-admin/update-core.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/update-core.php Mon Oct 14 17:39:30 2019 +0200
@@ -19,13 +19,24 @@
exit();
}
-if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) )
- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+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
+ *
+ * @staticvar bool $first_pass
+ *
+ * @param object $update
+ */
function list_core_update( $update ) {
- global $wp_local_package, $wpdb, $wp_version;
+ 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.
@@ -43,11 +54,10 @@
$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 or download the nightly build and install it manually:');
- $download = __('Download nightly build');
+ $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 or download the package and re-install manually:' ), $version_string );
+ $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 {
@@ -58,17 +68,20 @@
$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
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
- $message = sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically or download the package and install it manually:'), $update->current, $version_string);
+ /* 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 )
$show_buttons = false;
}
- $download = sprintf(__('Download %s'), $version_string);
}
echo '<p>';
@@ -81,18 +94,17 @@
echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
if ( $show_buttons ) {
if ( $first_pass ) {
- submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false );
+ submit_button( $submit, $current ? '' : 'primary regular', 'upgrade', false );
$first_pass = false;
} else {
- submit_button( $submit, 'button', 'upgrade', false );
+ submit_button( $submit, '', 'upgrade', false );
}
- echo ' <a href="' . esc_url( $update->download ) . '" class="button">' . $download . '</a> ';
}
if ( 'en_US' != $update->locale )
if ( !isset( $update->dismissed ) || !$update->dismissed )
- submit_button( __('Hide this update'), 'button', 'dismiss', false );
+ submit_button( __( 'Hide this update' ), '', 'dismiss', false );
else
- submit_button( __('Bring back this update'), 'button', 'undismiss', false );
+ 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>';
@@ -104,6 +116,9 @@
}
+/**
+ * @since 2.7.0
+ */
function dismissed_updates() {
$dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) );
if ( $dismissed ) {
@@ -122,7 +137,7 @@
<?php
echo '<p class="hide-if-no-js"><a id="show-dismissed" href="#">'.__('Show hidden updates').'</a></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>';
@@ -136,15 +151,17 @@
*
* @since 2.7.0
*
- * @return null
+ * @global string $required_php_version
+ * @global string $required_mysql_version
*/
function core_upgrade_preamble() {
- global $wp_version, $required_php_version, $required_mysql_version;
+ global $required_php_version, $required_mysql_version;
+ $wp_version = get_bloginfo( 'version' );
$updates = get_core_updates();
if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
- echo '<h3>';
+ echo '<h2>';
_e('You have the latest version of WordPress.');
if ( wp_http_supports( array( 'ssl' ) ) ) {
@@ -160,15 +177,15 @@
if ( $should_auto_update )
echo ' ' . __( 'Future security updates will be applied automatically.' );
}
- echo '</h3>';
+ echo '</h2>';
} else {
- echo '<div class="updated inline"><p>';
+ 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.');
echo '</p></div>';
- echo '<h3 class="response">';
+ echo '<h2 class="response">';
_e( 'An updated version of WordPress is available.' );
- echo '</h3>';
+ echo '</h2>';
}
if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
@@ -182,7 +199,7 @@
}
echo '<ul class="core-updates">';
- foreach( (array) $updates as $update ) {
+ foreach ( (array) $updates as $update ) {
echo '<li>';
list_core_update( $update );
echo '</li>';
@@ -199,14 +216,13 @@
}
function list_plugin_updates() {
- global $wp_version;
-
- $cur_wp_version = preg_replace('/-.*$/', '', $wp_version);
+ $wp_version = get_bloginfo( 'version' );
+ $cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
$plugins = get_plugin_updates();
if ( empty( $plugins ) ) {
- echo '<h3>' . __( 'Plugins' ) . '</h3>';
+ echo '<h2>' . __( 'Plugins' ) . '</h2>';
echo '<p>' . __( 'Your plugins are all up to date.' ) . '</p>';
return;
}
@@ -218,41 +234,49 @@
else
$core_update_version = $core_updates[0]->current;
?>
-<h3><?php _e( 'Plugins' ); ?></h3>
+<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>
-<table class="widefat" id="update-plugins-table">
+<table class="widefat updates-table" id="update-plugins-table">
<thead>
<tr>
- <th scope="col" class="manage-column check-column"><input type="checkbox" id="plugins-select-all" /></th>
- <th scope="col" class="manage-column"><label for="plugins-select-all"><?php _e('Select All'); ?></label></th>
+ <td class="manage-column check-column"><input type="checkbox" id="plugins-select-all" /></td>
+ <td class="manage-column"><label for="plugins-select-all"><?php _e( 'Select All' ); ?></label></td>
</tr>
</thead>
<tbody class="plugins">
<?php
- foreach ( (array) $plugins as $plugin_file => $plugin_data) {
- $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug ));
- if ( is_wp_error( $info ) ) {
- $info = false;
+ 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' );
+ 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($info->tested) && version_compare($info->tested, $cur_wp_version, '>=') ) {
+ 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($info->compatibility[$cur_wp_version][$plugin_data->update->new_version]) ) {
- $compat = $info->compatibility[$cur_wp_version][$plugin_data->update->new_version];
- $compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $cur_wp_version, $compat[0], $compat[2], $compat[1]);
+ } 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);
} else {
$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($info->compatibility[$core_update_version][$plugin_data->update->new_version]) ) {
- $update_compat = $info->compatibility[$core_update_version][$plugin_data->update->new_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[0], $update_compat[2], $update_compat[1]);
+ 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);
}
@@ -265,22 +289,49 @@
}
$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_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
- $details = sprintf('<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text);
+ $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 */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
+ /* translators: %s: plugin version */
+ sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
+ );
- echo "
- <tr>
- <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>
- <td><p><strong>{$plugin_data->Name}</strong><br />" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . ' ' . $details . $compat . $upgrade_notice . "</p></td>
- </tr>";
+ $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>
+ <?php
}
?>
</tbody>
<tfoot>
<tr>
- <th scope="col" class="manage-column check-column"><input type="checkbox" id="plugins-select-all-2" /></th>
- <th scope="col" class="manage-column"><label for="plugins-select-all-2"><?php _e( 'Select All' ); ?></label></th>
+ <td class="manage-column check-column"><input type="checkbox" id="plugins-select-all-2" /></td>
+ <td class="manage-column"><label for="plugins-select-all-2"><?php _e( 'Select All' ); ?></label></td>
</tr>
</tfoot>
</table>
@@ -289,47 +340,69 @@
<?php
}
+/**
+ * @since 2.9.0
+ */
function list_theme_updates() {
$themes = get_theme_updates();
if ( empty( $themes ) ) {
- echo '<h3>' . __( 'Themes' ) . '</h3>';
+ echo '<h2>' . __( 'Themes' ) . '</h2>';
echo '<p>' . __( 'Your themes are all up to date.' ) . '</p>';
return;
}
$form_action = 'update-core.php?action=do-theme-upgrade';
-
?>
-<h3><?php _e( 'Themes' ); ?></h3>
+<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>
<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>
-<table class="widefat" id="update-themes-table">
+<table class="widefat updates-table" id="update-themes-table">
<thead>
<tr>
- <th scope="col" class="manage-column check-column"><input type="checkbox" id="themes-select-all" /></th>
- <th scope="col" class="manage-column"><label for="themes-select-all"><?php _e('Select All'); ?></label></th>
+ <td class="manage-column check-column"><input type="checkbox" id="themes-select-all" /></td>
+ <td class="manage-column"><label for="themes-select-all"><?php _e( 'Select All' ); ?></label></td>
</tr>
</thead>
<tbody class="plugins">
<?php
foreach ( $themes as $stylesheet => $theme ) {
- echo "
- <tr>
- <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr( $stylesheet ) . "' /></th>
- <td class='plugin-title'><img src='" . esc_url( $theme->get_screenshot() ) . "' width='85' height='64' style='float:left; padding: 0 5px 5px' /><strong>" . $theme->display('Name') . '</strong> ' . sprintf( __( 'You have version %1$s installed. Update to %2$s.' ), $theme->display('Version'), $theme->update['new_version'] ) . "</td>
- </tr>";
+ $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
}
?>
</tbody>
<tfoot>
<tr>
- <th scope="col" class="manage-column check-column"><input type="checkbox" id="themes-select-all-2" /></th>
- <th scope="col" class="manage-column"><label for="themes-select-all-2"><?php _e( 'Select All' ); ?></label></th>
+ <td class="manage-column check-column"><input type="checkbox" id="themes-select-all-2" /></td>
+ <td class="manage-column"><label for="themes-select-all-2"><?php _e( 'Select All' ); ?></label></td>
</tr>
</tfoot>
</table>
@@ -338,11 +411,14 @@
<?php
}
+/**
+ * @since 3.7.0
+ */
function list_translation_updates() {
$updates = wp_get_translation_updates();
if ( ! $updates ) {
if ( 'en_US' != get_locale() ) {
- echo '<h3>' . __( 'Translations' ) . '</h3>';
+ echo '<h2>' . __( 'Translations' ) . '</h2>';
echo '<p>' . __( 'Your translations are all up to date.' ) . '</p>';
}
return;
@@ -350,7 +426,7 @@
$form_action = 'update-core.php?action=do-translation-upgrade';
?>
- <h3><?php _e( 'Translations' ); ?></h3>
+ <h2><?php _e( 'Translations' ); ?></h2>
<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-translations" class="upgrade">
<p><?php _e( 'New translations are available.' ); ?></p>
<?php wp_nonce_field( 'upgrade-translations' ); ?>
@@ -364,7 +440,9 @@
*
* @since 2.7.0
*
- * @return null
+ * @global WP_Filesystem_Base $wp_filesystem Subclass
+ *
+ * @param bool $reinstall
*/
function do_core_upgrade( $reinstall = false ) {
global $wp_filesystem;
@@ -389,7 +467,7 @@
?>
<div class="wrap">
- <h2><?php _e('Update WordPress'); ?></h2>
+ <h1><?php _e( 'Update WordPress' ); ?></h1>
<?php
if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
@@ -423,7 +501,7 @@
if ( is_wp_error($result) ) {
show_message($result);
- if ('up_to_date' != $result->get_error_code() )
+ if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() )
show_message( __('Installation Failed') );
echo '</div>';
return;
@@ -440,6 +518,9 @@
<?php
}
+/**
+ * @since 2.7.0
+ */
function do_dismiss_core_update() {
$version = isset( $_POST['version'] )? $_POST['version'] : false;
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
@@ -451,6 +532,9 @@
exit;
}
+/**
+ * @since 2.7.0
+ */
function do_undismiss_core_update() {
$version = isset( $_POST['version'] )? $_POST['version'] : false;
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
@@ -474,7 +558,7 @@
$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 and plugins from the WordPress.org repositories.' ) . '</p>';
+$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(
@@ -498,8 +582,8 @@
get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Updates_Screen" target="_blank">Documentation on Updating WordPress</a>' ) . '</p>' .
- '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</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>'
);
if ( 'upgrade-core' == $action ) {
@@ -510,7 +594,7 @@
require_once(ABSPATH . 'wp-admin/admin-header.php');
?>
<div class="wrap">
- <h2><?php _e('WordPress Updates'); ?></h2>
+ <h1><?php _e( 'WordPress Updates' ); ?></h1>
<?php
if ( $upgrade_error ) {
echo '<div class="error"><p>';
@@ -521,21 +605,32 @@
echo '</p></div>';
}
+ $last_update_check = false;
+ $current = get_site_transient( 'update_core' );
+
+ 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. */
- printf( __('Last checked on %1$s at %2$s.'), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ) );
+ 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>';
- if ( $core = current_user_can( 'update_core' ) )
+ if ( current_user_can( 'update_core' ) ) {
core_upgrade_preamble();
- if ( $plugins = current_user_can( 'update_plugins' ) )
+ }
+ if ( current_user_can( 'update_plugins' ) ) {
list_plugin_updates();
- if ( $themes = current_user_can( 'update_themes' ) )
+ }
+ if ( current_user_can( 'update_themes' ) ) {
list_theme_updates();
- if ( $core || $plugins || $themes )
+ }
+ if ( current_user_can( 'update_languages' ) ) {
list_translation_updates();
- unset( $core, $plugins, $themes );
+ }
+
/**
* Fires after the core, plugin, and theme update tables.
*
@@ -543,12 +638,17 @@
*/
do_action( 'core_upgrade_preamble' );
echo '</div>';
+
+ wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+ 'totals' => wp_get_update_data(),
+ ) );
+
include(ABSPATH . 'wp-admin/admin-footer.php');
} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
if ( ! current_user_can( 'update_core' ) )
- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
check_admin_referer('upgrade-core');
@@ -567,12 +667,16 @@
if ( isset( $_POST['upgrade'] ) )
do_core_upgrade($reinstall);
+ wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+ 'totals' => wp_get_update_data(),
+ ) );
+
include(ABSPATH . 'wp-admin/admin-footer.php');
} elseif ( 'do-plugin-upgrade' == $action ) {
if ( ! current_user_can( 'update_plugins' ) )
- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
check_admin_referer('upgrade-core');
@@ -592,15 +696,20 @@
require_once(ABSPATH . 'wp-admin/admin-header.php');
echo '<div class="wrap">';
- echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
- echo '<iframe src="', $url, '" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0"></iframe>';
+ 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(),
+ ) );
+
include(ABSPATH . 'wp-admin/admin-footer.php');
} elseif ( 'do-theme-upgrade' == $action ) {
if ( ! current_user_can( 'update_themes' ) )
- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
check_admin_referer('upgrade-core');
@@ -621,16 +730,21 @@
require_once(ABSPATH . 'wp-admin/admin-header.php');
?>
<div class="wrap">
- <h2><?php echo esc_html__('Update Themes') ?></h2>
- <iframe src="<?php echo $url ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0"></iframe>
+ <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>
</div>
<?php
+
+ wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+ 'totals' => wp_get_update_data(),
+ ) );
+
include(ABSPATH . 'wp-admin/admin-footer.php');
} elseif ( 'do-translation-upgrade' == $action ) {
- if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) )
- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+ if ( ! current_user_can( 'update_languages' ) )
+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
check_admin_referer( 'upgrade-translations' );
@@ -645,6 +759,10 @@
$upgrader = new Language_Pack_Upgrader( new Language_Pack_Upgrader_Skin( compact( 'url', 'nonce', 'title', 'context' ) ) );
$result = $upgrader->bulk_upgrade();
+ wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+ 'totals' => wp_get_update_data(),
+ ) );
+
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
} else {