diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/update-core.php --- a/wp/wp-admin/update-core.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/update-core.php Mon Oct 14 18:28:13 2019 +0200 @@ -19,11 +19,11 @@ exit(); } -if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) ) +if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) ) { wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); +} /** - * * @global string $wp_local_package * @global wpdb $wpdb * @@ -32,55 +32,74 @@ * @param object $update */ function list_core_update( $update ) { - global $wp_local_package, $wpdb; - static $first_pass = true; + global $wp_local_package, $wpdb; + static $first_pass = true; $wp_version = get_bloginfo( 'version' ); - 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 ); + if ( 'en_US' == $update->locale && 'en_US' == get_locale() ) { + $version_string = $update->current; + } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) { + // If the only available update is a partial builds, it doesn't need a language-specific version string. + $version_string = $update->current; + } else { + $version_string = sprintf( '%s–%s', $update->current, $update->locale ); + } $current = false; - if ( !isset($update->response) || 'latest' == $update->response ) + if ( ! isset( $update->response ) || 'latest' == $update->response ) { $current = true; - $submit = __('Update Now'); - $form_action = 'update-core.php?action=do-core-upgrade'; - $php_version = phpversion(); - $mysql_version = $wpdb->db_version(); - $show_buttons = true; + } + $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:'); + $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' ); } else { if ( $current ) { - $message = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string ); - $submit = __('Re-install Now'); + $message = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $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, '>=' ); - if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) + $php_compat = version_compare( $php_version, $update->php_version, '>=' ); + if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) { $mysql_compat = true; - else + } else { $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' ); + } + + $version_url = sprintf( + /* translators: %s: WordPress version */ + esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ), + sanitize_title( $update->current ) + ); + + /* translators: %s: Update PHP page URL */ + $php_update_message = '
' . sprintf( __( 'Learn more about updating PHP.' ), esc_url( wp_get_update_php_url() ) ); - if ( !$mysql_compat && !$php_compat ) - /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */ - $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 ) - /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */ - $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 ) - /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */ - $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 - /* translators: 1: WordPress version number, 2: WordPress version number including locale if necessary */ - $message = sprintf(__('You can update to WordPress %2$s automatically:'), $update->current, $version_string); - if ( !$mysql_compat || !$php_compat ) + $annotation = wp_get_update_php_annotation(); + if ( $annotation ) { + $php_update_message .= '
' . $annotation . ''; + } + + if ( ! $mysql_compat && ! $php_compat ) { + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */ + $message = sprintf( __( 'You cannot update because WordPress %2$s requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ) . $php_update_message; + } elseif ( ! $php_compat ) { + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */ + $message = sprintf( __( 'You cannot update because WordPress %2$s requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->php_version, $php_version ) . $php_update_message; + } elseif ( ! $mysql_compat ) { + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */ + $message = sprintf( __( 'You cannot update because WordPress %2$s requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->mysql_version, $mysql_version ); + } else { + /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary */ + $message = sprintf( __( 'You can update to WordPress %2$s automatically:' ), $version_url, $version_string ); + } + if ( ! $mysql_compat || ! $php_compat ) { $show_buttons = false; + } } } @@ -88,10 +107,10 @@ echo $message; echo '
'; echo ''; @@ -120,24 +141,28 @@ * @since 2.7.0 */ function dismissed_updates() { - $dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) ); + $dismissed = get_core_updates( + array( + 'dismissed' => true, + 'available' => false, + ) + ); if ( $dismissed ) { - $show_text = esc_js(__('Show hidden updates')); - $hide_text = esc_js(__('Hide hidden updates')); - ?> + $show_text = esc_js( __( 'Show hidden updates' ) ); + $hide_text = esc_js( __( 'Hide hidden updates' ) ); + ?> - '.__('Show hidden updates').''; + '; 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 '
' . __( '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 ) . '
'; + echo '' . sprintf( __( 'Learn more about WordPress %2$s.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '
'; } dismissed_updates(); } function list_plugin_updates() { - $wp_version = get_bloginfo( 'version' ); + $wp_version = get_bloginfo( 'version' ); $cur_wp_version = preg_replace( '/-.*$/', '', $wp_version ); - require_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); + require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); $plugins = get_plugin_updates(); if ( empty( $plugins ) ) { echo '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' ) ); ?>
++ Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications.' ), + __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ) + ); + ?> +
-new_files ) && ! $update->new_files; -?> + ?>' . __( 'On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations from the WordPress.org repositories.' ) . '
'; $updates_overview .= '' . __( 'If an update is available, you᾿ll see a notification appear in the Toolbar and navigation menu.' ) . ' ' . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' ) . '
'; -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __( 'Overview' ), - 'content' => $updates_overview -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'overview', + 'title' => __( 'Overview' ), + 'content' => $updates_overview, + ) +); $updates_howto = '' . __( 'WordPress — Updating your WordPress installation is a simple one-click procedure: just click on the “Update Now” button when you are notified that a new version is available.' ) . ' ' . __( 'In most cases, WordPress will automatically apply maintenance and security updates in the background for you.' ) . '
'; $updates_howto .= '' . __( 'Themes and Plugins — To update individual themes or plugins from this screen, use the checkboxes to make your selection, then click on the appropriate “Update” button. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.' ) . '
'; @@ -574,16 +644,18 @@ $updates_howto .= '' . __( 'Translations — The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can click the “Update Translations” button.' ) . '
'; } -get_current_screen()->add_help_tab( array( - 'id' => 'how-to-update', - 'title' => __( 'How to Update' ), - 'content' => $updates_howto -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'how-to-update', + 'title' => __( 'How to Update' ), + 'content' => $updates_howto, + ) +); get_current_screen()->set_help_sidebar( - '' . __('For more information:') . '
' . + '' . __( 'For more information:' ) . '
' . '' . __( 'Documentation on Updating WordPress' ) . '
' . - '' . __( 'Support Forums' ) . '
' + '' . __( 'Support' ) . '
' ); if ( 'upgrade-core' == $action ) { @@ -591,31 +663,32 @@ $force_check = ! empty( $_GET['force-check'] ); wp_version_check( array(), $force_check ); - require_once(ABSPATH . 'wp-admin/admin-header.php'); + 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.'); + if ( $upgrade_error == 'themes' ) { + _e( 'Please select one or more themes to update.' ); + } else { + _e( 'Please select one or more plugins to update.' ); + } echo '
'; - /* translators: %1 date, %2 time. */ + /* translators: 1: date, 2: time */ printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ), $last_update_check ), date_i18n( __( 'g:i a' ), $last_update_check ) ); - echo ' ' . __( 'Check Again' ) . ''; + echo ' ' . __( 'Check Again' ) . ''; echo '
'; if ( current_user_can( 'update_core' ) ) { @@ -639,129 +712,156 @@ do_action( 'core_upgrade_preamble' ); echo ''; - wp_localize_script( 'updates', '_wpUpdatesItemCounts', array( - 'totals' => wp_get_update_data(), - ) ); + wp_localize_script( + 'updates', + '_wpUpdatesItemCounts', + array( + 'totals' => wp_get_update_data(), + ) + ); - include(ABSPATH . 'wp-admin/admin-footer.php'); + include( ABSPATH . 'wp-admin/admin-footer.php' ); } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) { - if ( ! current_user_can( 'update_core' ) ) + if ( ! current_user_can( 'update_core' ) ) { wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); + } - check_admin_referer('upgrade-core'); + check_admin_referer( 'upgrade-core' ); // Do the (un)dismiss actions before headers, so that they can redirect. - if ( isset( $_POST['dismiss'] ) ) + if ( isset( $_POST['dismiss'] ) ) { do_dismiss_core_update(); - elseif ( isset( $_POST['undismiss'] ) ) + } elseif ( isset( $_POST['undismiss'] ) ) { do_undismiss_core_update(); + } - require_once(ABSPATH . 'wp-admin/admin-header.php'); - if ( 'do-core-reinstall' == $action ) + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + if ( 'do-core-reinstall' == $action ) { $reinstall = true; - else + } else { $reinstall = false; + } - if ( isset( $_POST['upgrade'] ) ) - do_core_upgrade($reinstall); + if ( isset( $_POST['upgrade'] ) ) { + do_core_upgrade( $reinstall ); + } - wp_localize_script( 'updates', '_wpUpdatesItemCounts', array( - 'totals' => wp_get_update_data(), - ) ); + wp_localize_script( + 'updates', + '_wpUpdatesItemCounts', + array( + 'totals' => wp_get_update_data(), + ) + ); - include(ABSPATH . 'wp-admin/admin-footer.php'); + include( ABSPATH . 'wp-admin/admin-footer.php' ); } elseif ( 'do-plugin-upgrade' == $action ) { - if ( ! current_user_can( 'update_plugins' ) ) + if ( ! current_user_can( 'update_plugins' ) ) { wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); + } - check_admin_referer('upgrade-core'); + check_admin_referer( 'upgrade-core' ); if ( isset( $_GET['plugins'] ) ) { $plugins = explode( ',', $_GET['plugins'] ); } elseif ( isset( $_POST['checked'] ) ) { $plugins = (array) $_POST['checked']; } else { - wp_redirect( admin_url('update-core.php') ); + wp_redirect( admin_url( 'update-core.php' ) ); exit; } - $url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins)); - $url = wp_nonce_url($url, 'bulk-update-plugins'); + $url = 'update.php?action=update-selected&plugins=' . urlencode( implode( ',', $plugins ) ); + $url = wp_nonce_url( $url, 'bulk-update-plugins' ); - $title = __('Update Plugins'); + $title = __( 'Update Plugins' ); - require_once(ABSPATH . 'wp-admin/admin-header.php'); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); echo '