X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/48ab98cb1779cf2088c1351ac3dd3d0da6fb31d3..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/update-core.php?ds=sidebyside diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index f88025e0..a8eb7f51 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -58,13 +58,13 @@ function list_core_update( $update ) { $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 ); + $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 ) - $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version ); + $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version ); elseif ( !$mysql_compat ) - $message = sprintf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version ); + $message = sprintf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version ); else - $message = sprintf(__('You can update to WordPress %2$s automatically or download the package and install it manually:'), $update->current, $version_string); + $message = sprintf(__('You can update to WordPress %2$s automatically or download the package and install it manually:'), $update->current, $version_string); if ( !$mysql_compat || !$php_compat ) $show_buttons = false; } @@ -163,7 +163,7 @@ function core_upgrade_preamble() { echo ''; } else { echo '

'; - _e('Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page.'); + _e('Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page.'); echo '

'; echo '

'; @@ -231,16 +231,14 @@ function list_plugin_updates() { - - - - - - $plugin_data) { $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug )); + if ( is_wp_error( $info ) ) { + $info = false; + } + // Get plugin compat for running version of WordPress. if ( isset($info->tested) && version_compare($info->tested, $cur_wp_version, '>=') ) { $compat = '
' . sprintf(__('Compatibility with WordPress %1$s: 100%% (according to its author)'), $cur_wp_version); @@ -278,6 +276,13 @@ function list_plugin_updates() { } ?> + + + + + + +

@@ -297,7 +302,7 @@ function list_theme_updates() { ?>

-

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

+

Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ); ?>

@@ -309,12 +314,6 @@ function list_theme_updates() { - - - - - - $theme ) { @@ -326,6 +325,13 @@ function list_theme_updates() { } ?> + + + + + + +

@@ -346,7 +352,7 @@ function list_translation_updates() { ?>

-

+

@@ -377,19 +383,23 @@ function do_core_upgrade( $reinstall = false ) { if ( !$update ) return; + // Allow relaxed file ownership writes for User-initiated upgrades when the API specifies + // that it's safe to do so. This only happens when there are no new files to create. + $allow_relaxed_file_ownership = ! $reinstall && isset( $update->new_files ) && ! $update->new_files; + ?>

'; return; } - if ( ! WP_Filesystem( $credentials, ABSPATH ) ) { + if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) { // Failed to connect, Error and request again - request_filesystem_credentials( $url, '', true, ABSPATH ); + request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ); echo '
'; return; } @@ -407,7 +417,9 @@ function do_core_upgrade( $reinstall = false ) { add_filter( 'update_feedback', 'show_message' ); $upgrader = new Core_Upgrader(); - $result = $upgrader->upgrade( $update ); + $result = $upgrader->upgrade( $update, array( + 'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership + ) ); if ( is_wp_error($result) ) { show_message($result); @@ -486,7 +498,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

' . - '

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

' . + '

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

' . '

' . __( 'Support Forums' ) . '

' ); @@ -639,7 +651,7 @@ if ( 'upgrade-core' == $action ) { /** * Fires for each custom update action on the WordPress Updates screen. * - * The dynamic portion of the hook name, $action, refers to the + * The dynamic portion of the hook name, `$action`, refers to the * passed update action. The hook fires in lieu of all available * default update actions. *