X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d954c87a1e3f0e671855614661da9e5825279134..8a4706fdeb1ae30268e510df6ccf3c39b3028059:/wp-admin/update-core.php
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 81472f23..a45b9be9 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -9,32 +9,47 @@
/** WordPress Administration Bootstrap */
require_once('./admin.php');
-if ( ! current_user_can('update_plugins') )
- wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
+wp_enqueue_style( 'plugin-install' );
+wp_enqueue_script( 'plugin-install' );
+add_thickbox();
+
+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'update-core.php' ) );
+ 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.' ) );
function list_core_update( $update ) {
global $wp_local_package, $wpdb;
+ static $first_pass = true;
+
$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;
- $submit = __('Update Automatically');
+ $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 or download the nightly build and install it manually:');
+ $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');
} 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);
- $submit = __('Re-install Automatically');
+ $submit = __('Re-install Now');
$form_action = 'update-core.php?action=do-core-reinstall';
} else {
$php_compat = version_compare( $php_version, $update->php_version, '>=' );
- $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
+ if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+ $mysql_compat = true;
+ else
+ $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
+
if ( !$mysql_compat && !$php_compat )
$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 )
@@ -58,19 +73,24 @@ function list_core_update( $update ) {
echo '';
echo '';
if ( $show_buttons ) {
- echo ' ';
- echo '' . $download . ' ';
+ if ( $first_pass ) {
+ submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false );
+ $first_pass = false;
+ } else {
+ submit_button( $submit, 'button', 'upgrade', false );
+ }
+ echo ' ' . $download . ' ';
}
if ( 'en_US' != $update->locale )
if ( !isset( $update->dismissed ) || !$update->dismissed )
- echo '';
+ submit_button( __('Hide this update'), 'button', 'dismiss', false );
else
- echo '';
+ submit_button( __('Bring back this update'), 'button', '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.').'
'.sprintf( __('You are about to install WordPress %s in English. There is a chance this upgrade will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'
';
+ 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 '';
@@ -111,27 +131,17 @@ function dismissed_updates() {
* @return null
*/
function core_upgrade_preamble() {
- global $upgrade_error;
+ global $wp_version;
$updates = get_core_updates();
-?>
-
-
-
-
';
- _e('Please select one or more plugins to upgrade.');
- 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.' ) . '
';
+ if ( $updates ) {
+ 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.' ) . '
Please Note: Any customizations you have made to the Themes files will be lost. Please consider using child themes for modifications.'), _x('http://codex.wordpress.org/Child_Themes', 'Link used in suggestion to use child themes in GUU') ); ?>
+
Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications.'), _x('http://codex.wordpress.org/Child_Themes', 'Link used in suggestion to use child themes in GUU') ); ?>