diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/upgrade.php --- a/wp/wp-admin/upgrade.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-admin/upgrade.php Tue Dec 15 13:49:49 2020 +0100 @@ -15,12 +15,11 @@ define( 'WP_INSTALLING', true ); /** Load WordPress Bootstrap */ -require( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); +require dirname( __DIR__ ) . '/wp-load.php'; nocache_headers(); -timer_start(); -require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); +require_once ABSPATH . 'wp-admin/includes/upgrade.php'; delete_site_transient( 'update_core' ); @@ -37,9 +36,9 @@ } /** - * @global string $wp_version - * @global string $required_php_version - * @global string $required_mysql_version + * @global string $wp_version The WordPress version string. + * @global string $required_php_version The required PHP version string. + * @global string $required_mysql_version The required MySQL version string. */ global $wp_version, $required_php_version, $required_mysql_version; @@ -54,54 +53,75 @@ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ); } -@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); +header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); ?> -> +> <?php _e( 'WordPress › Update' ); ?> - + - +

-

+

' . sprintf( __( 'Learn more about updating PHP.' ), esc_url( wp_get_update_php_url() ) ); + /* translators: %s: URL to Update PHP page. */ + $php_update_message = '

' . sprintf( + __( 'Learn more about updating PHP.' ), + esc_url( wp_get_update_php_url() ) + ); $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, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message; + $message = sprintf( + /* 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. */ + __( '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, + $wp_version, + $required_php_version, + $required_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, $wp_version, $required_php_version, $php_version ) . $php_update_message; + $message = sprintf( + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number. */ + __( 'You cannot update because WordPress %2$s requires PHP version %3$s or higher. You are running version %4$s.' ), + $version_url, + $wp_version, + $required_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, $wp_version, $required_mysql_version, $mysql_version ); + $message = sprintf( + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number. */ + __( 'You cannot update because WordPress %2$s requires MySQL version %3$s or higher. You are running version %4$s.' ), + $version_url, + $wp_version, + $required_mysql_version, + $mysql_version + ); } echo '

' . $message . '

'; @@ -132,15 +152,6 @@

- - -