Ticket #48059: 48059.diff

src/wp-includes/load.php

@@ -131 +131 @@
         $php_version = phpversion();
 
         if ( version_compare( $required_php_version, $php_version, '>' ) ) {
-                wp_load_translations_early();
-
                 $protocol = wp_get_server_protocol();
                 header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
                 header( 'Content-Type: text/html; charset=utf-8' );
-                /* translators: 1: Current PHP version number, 2: WordPress version number, 3: Minimum required PHP version number. */
-                printf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version );
+                printf( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.', $php_version, $wp_version, $required_php_version );
                 exit( 1 );
         }
 

src/wp-settings.php

@@ -15 +15 @@
  */
 define( 'WPINC', 'wp-includes' );
 
+/*
+ * These can't be directly globalized in version.php. When updating,
+ * we're including version.php from another installation and don't want
+ * these values to be overridden if already set.
+ */
+global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package;
+require( ABSPATH . WPINC . '/version.php' );
+require( ABSPATH . WPINC . '/load.php' );
+
+// Check for the required PHP version and for the MySQL extension or a database drop-in.
+wp_check_php_mysql_versions();
+
 // Include files required for initialization.
-require( ABSPATH . WPINC . '/load.php' );
 require( ABSPATH . WPINC . '/class-wp-paused-extensions-storage.php' );
 require( ABSPATH . WPINC . '/class-wp-fatal-error-handler.php' );
 require( ABSPATH . WPINC . '/class-wp-recovery-mode-cookie-service.php' );
@@ -28 +39 @@
 require( ABSPATH . WPINC . '/default-constants.php' );
 require_once( ABSPATH . WPINC . '/plugin.php' );
 
-/*
- * These can't be directly globalized in version.php. When updating,
- * we're including version.php from another installation and don't want
- * these values to be overridden if already set.
- */
-global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package;
-require( ABSPATH . WPINC . '/version.php' );
-
 /**
  * If not already configured, `$blog_id` will default to 1 in a single site
  * configuration. In multisite, it will be overridden by default in ms-settings.php.
@@ -51 +54 @@
 // Make sure we register the shutdown handler for fatal errors as soon as possible.
 wp_register_fatal_error_handler();
 
-// Check for the required PHP version and for the MySQL extension or a database drop-in.
-wp_check_php_mysql_versions();
-
 // WordPress calculates offsets from UTC.
 date_default_timezone_set( 'UTC' );