Index: trunk/src/wp-admin/update-core.php =================================================================== --- trunk/src/wp-admin/update-core.php (revision 49631) +++ trunk/src/wp-admin/update-core.php (revision 49638) @@ -63,5 +63,5 @@ if ( 'development' === $update->response ) { - $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build manually:' ); + $message = __( 'You can update to the latest nightly build manually:' ); } else { if ( $current ) { @@ -233,26 +233,5 @@ $updates = get_core_updates(); - if ( ! isset( $updates[0]->response ) || 'latest' === $updates[0]->response ) { - echo '
'; - echo '' . __( 'BETA TESTERS:' ) . ' ' . __( 'This site is set up to install updates of future beta versions automatically.' ); - echo '
is_vcs_checkout( ABSPATH ) ) {
+ _e( 'This site appears to be under version control. Automatic updates are disabled.' );
+ } elseif ( $upgrade_major ) {
_e( 'This site is automatically kept up to date with each new version of WordPress.' );
@@ -402,5 +379,5 @@
echo '
';
printf(
- '%s',
+ '%s',
wp_nonce_url( add_query_arg( 'value', 'disable', $action_url ), 'core-major-auto-updates-nonce' ),
__( 'Switch to automatic updates for maintenance and security releases only.' )
@@ -408,10 +385,10 @@
}
} elseif ( $upgrade_minor ) {
- _e( 'This site is automatically kept up to date with maintenance and security releases of WordPress.' );
+ _e( 'This site is automatically kept up to date with maintenance and security releases of WordPress only.' );
if ( $can_set_update_option ) {
echo '
';
printf(
- '%s',
+ '%s',
wp_nonce_url( add_query_arg( 'value', 'enable', $action_url ), 'core-major-auto-updates-nonce' ),
__( 'Enable automatic updates for all new versions of WordPress.' )