diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/upgrade.php
--- a/wp/wp-admin/upgrade.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/upgrade.php Mon Oct 14 18:28:13 2019 +0200
@@ -22,12 +22,13 @@
timer_start();
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-delete_site_transient('update_core');
+delete_site_transient( 'update_core' );
-if ( isset( $_GET['step'] ) )
+if ( isset( $_GET['step'] ) ) {
$step = $_GET['step'];
-else
+} else {
$step = 0;
+}
// Do it. No output.
if ( 'upgrade_db' === $step ) {
@@ -39,19 +40,19 @@
* @global string $wp_version
* @global string $required_php_version
* @global string $required_mysql_version
- * @global wpdb $wpdb
*/
global $wp_version, $required_php_version, $required_mysql_version;
$step = (int) $step;
-$php_version = phpversion();
-$mysql_version = $wpdb->db_version();
-$php_compat = version_compare( $php_version, $required_php_version, '>=' );
-if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+$php_version = phpversion();
+$mysql_version = $wpdb->db_version();
+$php_compat = version_compare( $php_version, $required_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, $required_mysql_version, '>=' );
+}
@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
?>
@@ -68,58 +69,80 @@
?>
-
+
-
+
-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.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
- elseif ( !$php_compat )
- printf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
- elseif ( !$mysql_compat )
- printf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
-?>
-
-
+ ' . 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;
+ } 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;
+ } 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 );
+ }
+
+ echo '
' . $message . '
';
+ ?>
+
+
-
-
+ $backto = wp_validate_redirect( $backto, __get_option( 'home' ) . '/' );
+ ?>
+
-