Wordpress 3.5

[autoinstalls/wordpress.git] / wp-includes / class-wp-ajax-response.php

diff --git a/wp-includes/class-wp-ajax-response.php b/wp-includes/class-wp-ajax-response.php
index 9c225c116ab95ee3dc84c6fe7b741a1525a5b0ed..24eb687f123f1e697d64678c8f9aae8178a539b8 100644 (file)
--- a/wp-includes/class-wp-ajax-response.php
+++ b/wp-includes/class-wp-ajax-response.php
@@ -126,13 +126,14 @@ class WP_Ajax_Response {
         * @since 2.1.0
         */
        function send() {
         * @since 2.1.0
         */
        function send() {

-               header('Content-Type: text/xml');
-               echo "<?xml version='1.0' standalone='yes'?><wp_ajax>";
+               header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
+               echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";

                foreach ( (array) $this->responses as $response )
                        echo $response;
                echo '</wp_ajax>';
                foreach ( (array) $this->responses as $response )
                        echo $response;
                echo '</wp_ajax>';

-               die();
+               if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+                       wp_die();
+               else
+                       die();

        }
 }
        }
 }

-
-?>