Changeset 45023

Timestamp:

03/27/2019 12:15:23 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Bootstrap/Load: In fatal error handler, pass the error information through to error template and associated filters: wp_php_error_message, wp_php_error_args.

This allows the custom error handler and default error message filters to inspect the error and perform logic based on its properties.

Props johnbillion.
Fixes #46620.

File:

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

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

@@ -40 +40 @@
             // Display the PHP error template if headers not sent.
             if ( ! headers_sent() ) {
-                $this->display_error_template();
+                $this->display_error_template( $error );
             }
         } catch ( Exception $e ) {
@@ -118 +118 @@
      *
      * @since 5.2.0
+     *
+     * @param array $error Error information retrieved from `error_get_last()`.
      */
-    protected function display_error_template() {
+    protected function display_error_template( $error ) {
         if ( defined( 'WP_CONTENT_DIR' ) ) {
             // Load custom PHP error template, if present.
@@ -131 +133 @@
 
         // Otherwise, display the default error template.
-        $this->display_default_error_template();
+        $this->display_default_error_template( $error );
     }
 
@@ -144 +146 @@
      *
      * @since 5.2.0
+     *
+     * @param array $error Error information retrieved from `error_get_last()`.
      */
-    protected function display_default_error_template() {
+    protected function display_default_error_template( $error ) {
         if ( ! function_exists( '__' ) ) {
             wp_load_translations_early();
@@ -167 +171 @@
          *
          * @param string $message HTML error message to display.
+         * @param array  $error   Error information retrieved from `error_get_last()`.
          */
-        $message = apply_filters( 'wp_php_error_message', $message );
+        $message = apply_filters( 'wp_php_error_message', $message, $error );
 
         /**
@@ -177 +182 @@
          * @param array $args Associative array of arguments passed to `wp_die()`. By default these contain a
          *                    'response' key, and optionally 'link_url' and 'link_text' keys.
+         * @param array $error Error information retrieved from `error_get_last()`.
          */
-        $args = apply_filters( 'wp_php_error_args', $args );
+        $args = apply_filters( 'wp_php_error_args', $args, $error );
 
-        $error = new WP_Error( 'internal_server_error', $message );
+        $wp_error = new WP_Error( 'internal_server_error', $message, array(
+            'error' => $error,
+        ) );
 
-        wp_die( $error, '', $args );
+        wp_die( $wp_error, '', $args );
     }
 }