Changeset 46119

Timestamp:

09/15/2019 01:17:24 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Site Health: Show a more specific fatal error message when in Recovery Mode with headers already sent.

Props garrett-eclipse, TimothyBlynJacobs, mukesh27, marybaum, afragen, Clorith, mdwolinski, SergeyBiryukov.
Fixes #47321.

File:

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

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

@@ -42 +42 @@
                         }
 
+                        $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 ) {
@@ -126 +128 @@
          *
          * @since 5.2.0
-         *
-         * @param array $error Error information retrieved from `error_get_last()`.
-         */
-        protected function display_error_template( $error ) {
+         * @since 5.3.0 The `$handled` parameter was added.
+         *
+         * @param array         $error   Error information retrieved from `error_get_last()`.
+         * @param true|WP_Error $handled Whether Recovery Mode handled the fatal error.
+         */
+        protected function display_error_template( $error, $handled ) {
                 if ( defined( 'WP_CONTENT_DIR' ) ) {
                         // Load custom PHP error template, if present.
@@ -141 +145 @@
 
                 // Otherwise, display the default error template.
-                $this->display_default_error_template( $error );
+                $this->display_default_error_template( $error, $handled );
         }
 
@@ -154 +158 @@
          *
          * @since 5.2.0
-         *
-         * @param array $error Error information retrieved from `error_get_last()`.
-         */
-        protected function display_default_error_template( $error ) {
+         * @since 5.3.0 The `$handled` parameter was added.
+         *
+         * @param array         $error   Error information retrieved from `error_get_last()`.
+         * @param true|WP_Error $handled Whether Recovery Mode handled the fatal error.
+         */
+        protected function display_default_error_template( $error, $handled ) {
                 if ( ! function_exists( '__' ) ) {
                         wp_load_translations_early();
@@ -170 +176 @@
                 }
 
-                if ( is_protected_endpoint() ) {
-                        $message = __( 'The site is experiencing technical difficulties. Please check your site admin email inbox for instructions.' );
+                if ( true === $handled && wp_is_recovery_mode() ) {
+                        $message = __( 'There has been a critical error on your website, putting it in recovery mode. Please check the Themes and Plugins screens for more details. If you just installed or updated a theme or plugin, check the relevant page for that first.' );
+                } elseif ( is_protected_endpoint() ) {
+                        $message = __( 'There has been a critical error on your website. Please check your site admin email inbox for instructions.' );
                 } else {
-                        $message = __( 'The site is experiencing technical difficulties.' );
+                        $message = __( 'There has been a critical error on your website.' );
                 }