Changeset 45311

Timestamp:

05/15/2019 06:18:02 PM (5 years ago)

Author:

desrosj

Message:

Bootstrap/Load: Prevent PHP errors when a drop-in triggers fatal error protection.

When a drop-in (such as advanced-cache.php) contains a PHP error, additional PHP errors are caused when displaying the error protection screen because load_default_textdomain() and WP_Error are not yet available.

Though recovery mode is not supported for mu-plugins and drop-ins, fatal error protection is. This change ensures the error screen is displayed when a fatal error is encountered within a drop-in and not a white screen.

Props TimothyBlynJacobs, spacedmonkey, daxelrod.
Fixes #47265.

File:

• trunk/src/wp-includes/class-wp-fatal-error-handler.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-fatal-error-handler.php

@@ -38 +38 @@
             }
 
-            if ( ! isset( $GLOBALS['wp_locale'] ) ) {
+            if ( ! isset( $GLOBALS['wp_locale'] ) && function_exists( 'load_default_textdomain' ) ) {
                 load_default_textdomain();
             }
@@ -166 +166 @@
         }
 
+        if ( ! class_exists( 'WP_Error' ) ) {
+            require_once ABSPATH . WPINC . '/class-wp-error.php';
+        }
+
         if ( is_protected_endpoint() ) {
             $message = __( 'The site is experiencing technical difficulties. Please check your site admin email inbox for instructions.' );