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 '
'; - wp_nonce_field('upgrade-core'); + wp_nonce_field( 'upgrade-core' ); echo '

'; - echo ''; - echo ''; + echo ''; + echo ''; if ( $show_buttons ) { if ( $first_pass ) { submit_button( $submit, $current ? '' : 'primary regular', 'upgrade', false ); @@ -100,17 +119,19 @@ submit_button( $submit, '', 'upgrade', false ); } } - if ( 'en_US' != $update->locale ) - if ( !isset( $update->dismissed ) || !$update->dismissed ) + if ( 'en_US' != $update->locale ) { + if ( ! isset( $update->dismissed ) || ! $update->dismissed ) { submit_button( __( 'Hide this update' ), '', 'dismiss', false ); - else + } else { submit_button( __( 'Bring back this update' ), '', '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.').'

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

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

'; + } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) { + // Partial builds don't need language-specific warnings. + 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 '
'; @@ -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 '