X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/784f914b1e4b1c62d6657e86397c2e83bcee4295..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-admin/update-core.php diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 38c30d4d..c6c21ead 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -20,22 +20,23 @@ if ( is_multisite() && ! is_network_admin() ) { } 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.' ) ); + wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); /** * * @global string $wp_local_package * @global wpdb $wpdb - * @global string $wp_version * * @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. @@ -53,11 +54,10 @@ function list_core_update( $update ) { $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 { @@ -68,17 +68,20 @@ function list_core_update( $update ) { $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 WordPress %1$s 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 WordPress %1$s 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 WordPress %1$s 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 WordPress %2$s 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 WordPress %2$s automatically:'), $update->current, $version_string); if ( !$mysql_compat || !$php_compat ) $show_buttons = false; } - $download = sprintf(__('Download %s'), $version_string); } echo '

'; @@ -91,18 +94,17 @@ function list_core_update( $update ) { echo ''; 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 ' ' . $download . ' '; } 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 '

'; if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) ) echo '

'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'

'; @@ -149,13 +151,13 @@ function dismissed_updates() { * * @since 2.7.0 * - * @global string $wp_version * @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 ) { @@ -213,14 +215,9 @@ function core_upgrade_preamble() { dismissed_updates(); } -/** - * - * @global string $wp_version - */ 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(); @@ -573,8 +570,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __( 'Documentation on Updating WordPress' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Updating WordPress' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); if ( 'upgrade-core' == $action ) { @@ -596,9 +593,16 @@ if ( 'upgrade-core' == $action ) { echo '

'; } + $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 '

'; /* translators: %1 date, %2 time. */ - printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ) ), date_i18n( __( 'g:i a' ) ) ); + 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 '   ' . __( 'Check Again' ) . ''; echo '

'; @@ -618,12 +622,17 @@ if ( 'upgrade-core' == $action ) { */ do_action( 'core_upgrade_preamble' ); echo ''; + + 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'); @@ -642,12 +651,16 @@ if ( 'upgrade-core' == $action ) { 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'); @@ -670,12 +683,17 @@ if ( 'upgrade-core' == $action ) { echo '

' . __( 'Update Plugins' ) . '

'; echo ''; echo ''; + + 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'); @@ -700,12 +718,17 @@ if ( 'upgrade-core' == $action ) { 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.' ) ); + wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); check_admin_referer( 'upgrade-translations' ); @@ -720,6 +743,10 @@ if ( 'upgrade-core' == $action ) { $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 {