Changeset 45014

Timestamp:

03/26/2019 08:29:52 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Bootstrap/Load: Always run the fatal error handler at shutdown, but don't display the PHP error template once headers are sent.

If a fatal error occurs midway through a page load, or in a REST API request, it still needs to be handled internally for the recovery mode, but the custom message may conflict with already rendered output, e.g. by displaying HTML markup in an XML or JSON request.

Props spacedmonkey, flixos90, TimothyBlynJacobs.
Fixes #45989. See #44458.

Location:

trunk/src

Files:

• wp-includes/class-wp-fatal-error-handler.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

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

@@ -27 +27 @@
      */
     public function handle() {
-        // Bail if WordPress executed successfully.
-        if ( defined( 'WP_EXECUTION_SUCCEEDED' ) && WP_EXECUTION_SUCCEEDED ) {
-            return;
-        }
-
         try {
             // Bail if no error found.
@@ -43 +38 @@
             }
 
-            // Display the PHP error template.
-            $this->display_error_template();
+            // Display the PHP error template if headers not sent.
+            if ( ! headers_sent() ) {
+                $this->display_error_template();
+            }
         } catch ( Exception $e ) {
             // Catch exceptions and remain silent.

trunk/src/wp-settings.php

@@ -545 +545 @@
  */
 do_action( 'wp_loaded' );
-
-/*
- * Store the fact that we could successfully execute the entire WordPress
- * lifecycle. This is used to skip the premature shutdown handler, as it cannot
- * be unregistered.
- */
-if ( ! defined( 'WP_EXECUTION_SUCCEEDED' ) ) {
-    define( 'WP_EXECUTION_SUCCEEDED', true );
-}