Changeset 45114

Timestamp:

04/05/2019 03:19:50 PM (5 years ago)

Author:

flixos90

Message:

Bootstrap/Load: Ensure WP_Fatal_Error_Handler does not conflict with existing mechanisms treating fatal errors.

Prior to this change, resuming or activating a plugin or theme that is still broken would result in a redirect loop if in recovery mode. If outside recovery mode, it would cause the error template to be displayed.

Furthermore this applies to breaking a plugin or theme when editing from the backend.

Props aandrewdixon, azaozz, dhanukanuwan, henrywright, ocean90, ohiosierra, PandelisZ, xkon.
Fixes #46045, #46751.

Location:

trunk/src

Files:

• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-includes/class-wp-fatal-error-handler.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)

trunk/src/wp-admin/includes/plugin.php

@@ -632 +632 @@
             wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) ); // we'll override this later if the plugin can be included without fatal error
         }
+
         ob_start();
         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
         $_wp_plugin_file = $plugin;
+
         include_once( WP_PLUGIN_DIR . '/' . $plugin );
         $plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
@@ -2126 +2128 @@
  */
 function plugin_sandbox_scrape( $plugin ) {
+
     wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
     include( WP_PLUGIN_DIR . '/' . $plugin );

trunk/src/wp-admin/includes/theme.php

@@ -860 +860 @@
             // Load the theme's functions.php to test whether it throws a fatal error.
             ob_start();
+
             include $functions_path;
             ob_clean();

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

@@ -27 +27 @@
      */
     public function handle() {
+
+
+
+
         try {
             // Bail if no error found.

trunk/src/wp-includes/load.php

@@ -1445 +1445 @@
         die();
     }
+
     register_shutdown_function( 'wp_finalize_scraping_edited_file_errors', $key );
 }