Ticket #46045: 46045.2.diff

src/wp-admin/includes/plugin.php

@@ -631 +631 @@
                 if ( ! empty( $redirect ) ) {
                         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;
+                define( 'WP_SANDBOX_SCRAPING', true );
                 include_once( WP_PLUGIN_DIR . '/' . $plugin );
                 $plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
 
@@ -2125 +2127 @@
  * @param string $plugin Path to the plugin file relative to the plugins directory.
  */
 function plugin_sandbox_scrape( $plugin ) {
+        define( 'WP_SANDBOX_SCRAPING', true );
         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
         include( WP_PLUGIN_DIR . '/' . $plugin );
 }

src/wp-admin/includes/theme.php

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

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

@@ -26 +26 @@
          * @since 5.2.0
          */
         public function handle() {
+                if ( defined( 'WP_SANDBOX_SCRAPING' ) && WP_SANDBOX_SCRAPING ) {
+                        return;
+                }
+
                 try {
                         // Bail if no error found.
                         $error = $this->detect_error();

src/wp-includes/load.php

@@ -1444 +1444 @@
                 echo "###### wp_scraping_result_end:$key ######";
                 die();
         }
+        define( 'WP_SANDBOX_SCRAPING', true );
         register_shutdown_function( 'wp_finalize_scraping_edited_file_errors', $key );
 }