diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/install.php --- a/wp/wp-admin/install.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/install.php Mon Oct 14 18:28:13 2019 +0200 @@ -8,7 +8,7 @@ // Sanity check. if ( false ) { -?> + ?>
WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.
'submit' ) ); ?>
' . 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 ) { +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 */ + $compat = sprintf( __( 'You cannot install 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 */ + $compat = sprintf( __( 'You cannot install 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 */ + $compat = sprintf( __( 'You cannot install 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 ); +} + +if ( ! $mysql_compat || ! $php_compat ) { display_header(); die( '
' . $compat . '