Ticket #46038: 46038.2.diff

src/wp-includes/class-wp-shutdown-handler.php

@@ -136 +136 @@
                         $php_error_pluggable = WP_CONTENT_DIR . '/php-error.php';
                         if ( is_readable( $php_error_pluggable ) ) {
                                 require_once $php_error_pluggable;
-                                die();
+                                return;
                         }
                 }
 
@@ -166 +166 @@
 
                 $message = __( 'The site is experiencing technical difficulties.' );
 
-                $args = array( 'response' => 500 );
+                $args = array(
+                        'response' => 500,
+                        'exit'     => false,
+                );
                 if ( function_exists( 'admin_url' ) ) {
                         $args['link_url']  = admin_url();
                         $args['link_text'] = __( 'Log into the admin backend to fix this.' );

src/wp-includes/functions.php

@@ -2957 +2957 @@
  *                                  Default is the value of is_rtl().
  *     @type string $code           Error code to use. Default is 'wp_die', or the main error code if $message
  *                                  is a WP_Error.
+ *     @type bool   $exit           Whether to exit the process after completion. Default true.
  * }
  */
 function wp_die( $message = '', $title = '', $args = array() ) {
@@ -3201 +3202 @@
 </body>
 </html>
         <?php
-        die();
+        if ( $r['exit'] ) {
+                die();
+        }
 }
 
 /**
@@ -3236 +3239 @@
         }
 
         echo wp_json_encode( $data );
-        die();
+        if ( $r['exit'] ) {
+                die();
+        }
 }
 
 /**
@@ -3262 +3267 @@
                 $error = new IXR_Error( $r['response'], $message );
                 $wp_xmlrpc_server->output( $error->getXml() );
         }
-        die();
+        if ( $r['exit'] ) {
+                die();
+        }
 }
 
 /**
@@ -3291 +3298 @@
         }
 
         if ( is_scalar( $message ) ) {
-                die( (string) $message );
+                $message = (string) $message;
+        } else {
+                $message = '0';
         }
-        die( '0' );
+
+        if ( $r['exit'] ) {
+                die( $message );
+        } else {
+                echo $message;
+        }
 }
 
 /**
@@ -3302 +3316 @@
  * This is the handler for wp_die when processing APP requests.
  *
  * @since 3.4.0
+ * @since 5.1.0 Added the $title and $args parameters.
  * @access private
  *
- * @param string $message Optional. Response to print. Default empty.
+ * @param string       $message Optional. Response to print. Default empty.
+ * @param string       $title   Optional. Error title (unused). Default empty.
+ * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _scalar_wp_die_handler( $message = '' ) {
+function _scalar_wp_die_handler( $message = '', $title = '', $args = array() ) {
+        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+
+        if ( $r['exit'] ) {
+                if ( is_scalar( $message ) ) {
+                        die( (string) $message );
+                }
+                die();
+        }
+
         if ( is_scalar( $message ) ) {
-                die( (string) $message );
+                echo (string) $message;
         }
-        die();
 }
 
 /**
@@ -3328 +3353 @@
         $defaults = array(
                 'response'          => 0,
                 'code'              => '',
+                'exit'              => true,
                 'back_link'         => false,
                 'link_url'          => '',
                 'link_text'         => '',