X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6e54d1cc889fd70eca54701860d695634b28a075..refs/tags/wordpress-3.7:/wp-admin/update-core.php diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 81472f23..99887d36 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -7,34 +7,55 @@ */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/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; - $version_string = ('en_US' == $update->locale && 'en_US' == get_locale() ) ? - $update->current : sprintf("%s–%s", $update->current, $update->locale); + 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 ); + $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'); + $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 { $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 +79,25 @@ 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.').'

'; - 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 ).'

'; + // 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 ''; @@ -111,27 +138,31 @@ function dismissed_updates() { * @return null */ function core_upgrade_preamble() { - global $upgrade_error; + global $wp_version, $required_php_version, $required_mysql_version; $updates = get_core_updates(); -?> -
- -

-

'; - _e('Please select one or more plugins to upgrade.'); - echo '

'; - } if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) { echo '

'; _e('You have the latest version of WordPress.'); + + if ( wp_http_supports( 'ssl' ) ) { + require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + $upgrader = new WP_Automatic_Updater; + $future_minor_update = (object) array( + 'current' => $wp_version . '.1.next.minor', + 'version' => $wp_version . '.1.next.minor', + 'php_version' => $required_php_version, + 'mysql_version' => $required_mysql_version, + ); + $should_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH ); + if ( $should_auto_update ) + echo ' ' . __( 'Future security updates will be applied automatically.' ); + } echo '

'; } else { - 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 '

'; echo '

'; @@ -139,23 +170,29 @@ 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 '

BETA TESTERS: This site is set up to install updates of future beta versions automatically.

'; + } + echo ''; - 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.' ) . '

'; + // Don't show the maintenance mode notice when we are only showing a single re-install option. + if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) { + 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.' ) . '

'; + } elseif ( ! $updates ) { + list( $normalized_version ) = explode( '-', $wp_version ); + echo '

' . sprintf( __( 'Learn more about WordPress %s.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '

'; + } dismissed_updates(); - - list_plugin_updates(); - list_theme_updates(); - do_action('core_upgrade_preamble'); - echo '
'; } function list_plugin_updates() { @@ -180,7 +217,7 @@ function list_plugin_updates() { ?>

-
+

@@ -225,10 +262,15 @@ function list_plugin_updates() { } else { $upgrade_notice = ''; } + + $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662'); + $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); + $details = sprintf('%3$s.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text); + echo " - + "; } ?> @@ -252,8 +294,8 @@ function list_theme_updates() { ?>

-

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.' ), __( 'http://codex.wordpress.org/Child_Themes' ) ); ?>

+

{$plugin_data->Name}" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "

{$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 . "
@@ -272,13 +314,11 @@ function list_theme_updates() { $theme_data) { - $screenshot = $theme_data->{'Theme Root URI'} . '/' . $stylesheet . '/' . $theme_data->Screenshot; - + foreach ( $themes as $stylesheet => $theme ) { echo " - - + + "; } ?> @@ -289,6 +329,27 @@ function list_theme_updates() { ' . __( 'Translations' ) . ''; + echo '

' . __( 'Your translations are all up to date.' ) . '

'; + } + return; + } + + $form_action = 'update-core.php?action=do-translation-upgrade'; + ?> +

+ +

+ +

+ +
- +

'; + return; + } + + if ( ! WP_Filesystem( $credentials, ABSPATH ) ) { + // Failed to connect, Error and request again + request_filesystem_credentials( $url, '', true, ABSPATH ); + echo '
'; + return; + } + if ( $wp_filesystem->errors->get_error_code() ) { foreach ( $wp_filesystem->errors->get_error_messages() as $message ) show_message($message); @@ -333,17 +402,28 @@ function do_core_upgrade( $reinstall = false ) { if ( $reinstall ) $update->response = 'reinstall'; - $result = wp_update_core($update, 'show_message'); + add_filter( 'update_feedback', 'show_message' ); + + $upgrader = new Core_Upgrader(); + $result = $upgrader->upgrade( $update ); if ( is_wp_error($result) ) { show_message($result); if ('up_to_date' != $result->get_error_code() ) show_message( __('Installation Failed') ); - } else { - show_message( __('WordPress updated successfully') ); - show_message( '' . __('Actions:') . '' . __('Go to Dashboard') . '' ); + echo ''; + return; } - echo ''; + + show_message( __('WordPress updated successfully') ); + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. Learn more.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); + ?> + + + ' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '

' . +get_current_screen()->add_help_tab( array( +'id' => 'overview', +'title' => __('Overview'), +'content' => + '

' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification.') . '

' . + '

' . __('It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '

' +) ); + +get_current_screen()->add_help_tab( array( +'id' => 'how-to-update', +'title' => __('How to Update'), +'content' => '

' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '

' . - '

' . __('To upgrade themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '

' . + '

' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '

' +) ); + +get_current_screen()->set_help_sidebar( '

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

' . - '

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

' . + '

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

' . '

' . __('Support Forums') . '

' ); if ( 'upgrade-core' == $action ) { + wp_version_check(); - require_once('./admin-header.php'); - core_upgrade_preamble(); + require_once(ABSPATH . 'wp-admin/admin-header.php'); + ?> +
+ +

+

'; + 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 ( $core = current_user_can( 'update_core' ) ) + core_upgrade_preamble(); + if ( $plugins = current_user_can( 'update_plugins' ) ) + list_plugin_updates(); + if ( $themes = current_user_can( 'update_themes' ) ) + list_theme_updates(); + if ( $core || $plugins || $themes ) + list_translation_updates(); + unset( $core, $plugins, $themes ); + do_action('core_upgrade_preamble'); + echo ''; + 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.' ) ); + check_admin_referer('upgrade-core'); // do the (un)dismiss actions before headers, @@ -404,7 +537,7 @@ if ( 'upgrade-core' == $action ) { elseif ( isset( $_POST['undismiss'] ) ) do_undismiss_core_update(); - require_once('./admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); if ( 'do-core-reinstall' == $action ) $reinstall = true; else @@ -413,7 +546,13 @@ if ( 'upgrade-core' == $action ) { if ( isset( $_POST['upgrade'] ) ) do_core_upgrade($reinstall); + 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.' ) ); + check_admin_referer('upgrade-core'); if ( isset( $_GET['plugins'] ) ) { @@ -421,7 +560,7 @@ if ( 'upgrade-core' == $action ) { } elseif ( isset( $_POST['checked'] ) ) { $plugins = (array) $_POST['checked']; } else { - wp_redirect('update-core.php'); + wp_redirect( admin_url('update-core.php') ); exit; } @@ -430,13 +569,19 @@ if ( 'upgrade-core' == $action ) { $title = __('Update Plugins'); - require_once('./admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '
'; screen_icon('plugins'); echo '

' . esc_html__('Update Plugins') . '

'; echo ""; echo '
'; + 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.' ) ); + check_admin_referer('upgrade-core'); if ( isset( $_GET['themes'] ) ) { @@ -444,7 +589,7 @@ if ( 'upgrade-core' == $action ) { } elseif ( isset( $_POST['checked'] ) ) { $themes = (array) $_POST['checked']; } else { - wp_redirect('update-core.php'); + wp_redirect( admin_url('update-core.php') ); exit; } @@ -453,12 +598,34 @@ if ( 'upgrade-core' == $action ) { $title = __('Update Themes'); - require_once('./admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '
'; screen_icon('themes'); echo '

' . esc_html__('Update Themes') . '

'; echo ""; echo '
'; -} + 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.' ) ); -include('./admin-footer.php'); + check_admin_referer( 'upgrade-translations' ); + + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + + $url = 'update-core.php?action=do-translation-upgrade'; + $nonce = 'upgrade-translations'; + $title = __( 'Update Translations' ); + $context = WP_LANG_DIR; + + $upgrader = new Language_Pack_Upgrader( new Language_Pack_Upgrader_Skin( compact( 'url', 'nonce', 'title', 'context' ) ) ); + $result = $upgrader->bulk_upgrade(); + + require_once( ABSPATH . 'wp-admin/admin-footer.php' ); + +} else { + do_action('update-core-custom_' . $action); +}
{$theme_data->Name}" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "" . $theme->display('Name') . ' ' . sprintf( __( 'You have version %1$s installed. Update to %2$s.' ), $theme->display('Version'), $theme->update['new_version'] ) . "