X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/00dbffaf1593b0ac719d98f00839221a9ca52133..2329f698283944696a7076258cf816545970bb47:/wp-admin/update-core.php diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index a45b9be9..f88025e0 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -7,10 +7,11 @@ */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); wp_enqueue_style( 'plugin-install' ); wp_enqueue_script( 'plugin-install' ); +wp_enqueue_script( 'updates' ); add_thickbox(); if ( is_multisite() && ! is_network_admin() ) { @@ -22,11 +23,17 @@ if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' wp_die( __( 'You do not have sufficient permissions to update this site.' ) ); function list_core_update( $update ) { - global $wp_local_package, $wpdb; - static $first_pass = true; + global $wp_local_package, $wpdb, $wp_version; + static $first_pass = true; + + 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–%s", $update->current, $update->locale ); - $version_string = ('en_US' == $update->locale && 'en_US' == get_locale() ) ? - $update->current : sprintf("%s–%s", $update->current, $update->locale); $current = false; if ( !isset($update->response) || 'latest' == $update->response ) $current = true; @@ -40,7 +47,7 @@ function list_core_update( $update ) { $download = __('Download nightly build'); } else { if ( $current ) { - $message = sprintf(__('You have the latest version of WordPress. You do not need to update. However, if you want to re-install version %s, you can do so automatically 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 or download the package and re-install manually:' ), $version_string ); $submit = __('Re-install Now'); $form_action = 'update-core.php?action=do-core-reinstall'; } else { @@ -89,7 +96,8 @@ function list_core_update( $update ) { 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.').'
'; - else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) { + // 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 ''.sprintf( __('You are about to install WordPress %s in English (US). 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 : '' ).'
'; } echo ''; @@ -126,18 +134,32 @@ function dismissed_updates() { /** * Display upgrade WordPress for downloading latest or upgrading automatically form. * - * @since 2.7 + * @since 2.7.0 * * @return null */ function core_upgrade_preamble() { - global $wp_version; + global $wp_version, $required_php_version, $required_mysql_version; $updates = get_core_updates(); if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) { echo ''; @@ -149,17 +171,27 @@ function core_upgrade_preamble() { echo ''; } + if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) { + 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 ) ) { + echo '
'; + echo '' . __( 'BETA TESTERS:' ) . ' ' . __( 'This site is set up to install updates of future beta versions automatically.' ); + echo '
' . __( '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.' ) . '
'; - } else { + } elseif ( ! $updates ) { list( $normalized_version ) = explode( '-', $wp_version ); echo '' . sprintf( __( 'Learn more about WordPress %s.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '
'; } @@ -188,10 +220,10 @@ function list_plugin_updates() { ?> -