Ticket #47321: 47321.2.diff

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

@@ -41 +41 @@
                                 load_default_textdomain();
                         }
 
+                        $handled = false;
+
                         if ( ! is_multisite() && wp_recovery_mode()->is_initialized() ) {
-                                wp_recovery_mode()->handle_error( $error );
+                                $handled = wp_recovery_mode()->handle_error( $error );
                         }
 
                         // Display the PHP error template if headers not sent.
                         if ( is_admin() || ! headers_sent() ) {
-                                $this->display_error_template( $error );
+                                $this->display_error_template( $error, $handled );
                         }
                 } catch ( Exception $e ) {
                         // Catch exceptions and remain silent.
@@ -125 +127 @@
          * If no such drop-in is available, this will call {@see WP_Fatal_Error_Handler::display_default_error_template()}.
          *
          * @since 5.2.0
+         * @since 5.2.2 The `$handled` parameter was added.
          *
-         * @param array $error Error information retrieved from `error_get_last()`.
+         * @param array         $error   Error information retrieved from `error_get_last()`.
+         * @param bool|WP_Error $handled Whether Recovery Mode handled the fatal error.
          */
-        protected function display_error_template( $error ) {
+        protected function display_error_template( $error, $handled ) {
                 if ( defined( 'WP_CONTENT_DIR' ) ) {
                         // Load custom PHP error template, if present.
                         $php_error_pluggable = WP_CONTENT_DIR . '/php-error.php';
@@ -140 +144 @@
                 }
 
                 // Otherwise, display the default error template.
-                $this->display_default_error_template( $error );
+                $this->display_default_error_template( $error, $handled );
         }
 
         /**
@@ -153 +157 @@
          * be used to modify these parameters.
          *
          * @since 5.2.0
+         * @since 5.2.2 The `$handled` parameter was added.
          *
-         * @param array $error Error information retrieved from `error_get_last()`.
+         * @param array         $error   Error information retrieved from `error_get_last()`.
+         * @param bool|WP_Error $handled Whether Recovery Mode handled the fatal error.
          */
-        protected function display_default_error_template( $error ) {
+        protected function display_default_error_template( $error, $handled ) {
                 if ( ! function_exists( '__' ) ) {
                         wp_load_translations_early();
                 }
@@ -169 +175 @@
                         require_once ABSPATH . WPINC . '/class-wp-error.php';
                 }
 
-                if ( is_protected_endpoint() ) {
+                if ( true === $handled && wp_is_recovery_mode() ) {
+                        $message = __( 'A fatal error was caught by recovery mode. Check the Plugins and/or Themes page for details.' );
+                } elseif ( is_protected_endpoint() ) {
                         $message = __( 'The site is experiencing technical difficulties. Please check your site admin email inbox for instructions.' );
                 } else {
                         $message = __( 'The site is experiencing technical difficulties.' );