Ticket #45989: 45989.7.diff

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

@@ -26 +26 @@
          * @since 5.2.0
          */
         public function handle() {
-                // Bail if WordPress executed successfully.
-                if ( defined( 'WP_EXECUTION_SUCCEEDED' ) && WP_EXECUTION_SUCCEEDED ) {
-                        return;
-                }
 
                 try {
                         // Bail if no error found.
@@ -42 +38 @@
                                 wp_recovery_mode()->handle_error( $error );
                         }
 
-                        // 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.
                 }

src/wp-settings.php

@@ -544 +544 @@
  * @since 3.0.0
  */
 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 );
-}