X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/c8946fda799b75451b0bee19b48736a13433a7e3..refs/tags/wordpress-3.3-scripts2:/wp-admin/update-core.php diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 81472f23..c071dc23 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -9,17 +9,28 @@ /** 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' ) ) + 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(); @@ -30,11 +41,15 @@ function list_core_update( $update ) { } 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', '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.').'
'; else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) { - echo ''.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,7 +131,7 @@ function dismissed_updates() { * @return null */ function core_upgrade_preamble() { - global $upgrade_error; + global $upgrade_error, $wp_version; $updates = get_core_updates(); ?> @@ -121,17 +141,26 @@ function core_upgrade_preamble() {'; - _e('Please select one or more plugins to upgrade.'); + if ( $upgrade_error == 'themes' ) + _e('Please select one or more themes to update.'); + else + _e('Please select one or more plugins to update.'); echo '
'; } + echo ''; + /* 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' ) ) ); + echo ' ' . __( 'Check Again' ) . ''; + echo '
'; + if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) { echo ''; - _e('Important: before updating, please backup your database and files. For help with updates, visit the Updating WordPress Codex page.'); + echo '
'; + _e('Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page.'); 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.' ) . '
'; + } else { + list( $normalized_version ) = explode( '-', $wp_version ); + echo '' . sprintf( __( 'Learn more about WordPress %s.' ), esc_url( admin_url( 'about.php' ) ), $normalized_version ) . '
'; + } dismissed_updates(); - list_plugin_updates(); - list_theme_updates(); + if ( current_user_can( 'update_plugins' ) ) + list_plugin_updates(); + if ( current_user_can( 'update_themes' ) ) + list_theme_updates(); do_action('core_upgrade_preamble'); echo '{$plugin_data->Name}
" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . ' ' . $details . $compat . $upgrade_notice . "
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') ); ?>