Ticket #8420: 8420.diff

wp-includes/functions.php

@@ -2660 +2660 @@
         if ( function_exists( 'apply_filters' ) ) {
                 $function = apply_filters( 'wp_die_handler', '_default_wp_die_handler');
         }else {
+            if(defined('DOING_AJAX') && DOING_AJAX)
+                $function = '_ajax_wp_die_handler';            
+            else
                 $function = '_default_wp_die_handler';
         }
 
@@ -2758 +2761 @@
         die();
 }
 
+function _ajax_die_handler_filter() { 
+    return '_ajax_wp_die_handler'; 
+}
+
 /**
+ * Kill WordPress execution and send AJAX response with error message.
+ *
+ * This is AJAX-version of the default handler for wp_die
+ *
+ * @since 3.0.0
+ * @access private
+ *
+ * @param string $message Error message.
+ * @param string $title Error title.
+ * @param string|array $args Optional arguements to control behaviour.
+ */
+function _ajax_wp_die_handler( $message, $title = '', $args = array() ) {    
+        $defaults = array( 'response' => 500 );
+        $r = wp_parse_args($args, $defaults);           
+        if ( !headers_sent() ) {
+                status_header( $r['response'] );
+        }
+        $resp   =   new WP_Ajax_Response( array(
+                        'what' => 'autosave',
+                        'id' => $message                        
+                ) );          
+        $resp->send();        
+        die();
+}
+/**
  * Retrieve the WordPress home page URL.
  *
  * If the constant named 'WP_HOME' exists, then it willl be used and returned by

wp-admin/admin-ajax.php

@@ -21 +21 @@
 
 require_once('./includes/admin.php');
 @header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+
+add_filter('wp_die_handler','_ajax_die_handler_filter');
+
 send_nosniff_header();
 
 do_action('admin_init');