Changeset 21531

Timestamp:

08/15/2012 08:12:00 PM (13 years ago)

Author:

ryan

Message:

Specify the encoding in IXR_Server::output(). Props solarissmoke, sergey.s.betke@…, SergeyBiryukov. fixes #4794

File:

• trunk/wp-includes/class-IXR.php (modified) (1 diff)

trunk/wp-includes/class-IXR.php

@@ -467 +467 @@
     function output($xml)
     {
-        $xml = '<?xml version="1.0"?>'."\n".$xml;
+        $charset = function_exists('get_option') ? get_option('blog_charset') : '';
+        if ($charset)
+            $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
+        else
+            $xml = '<?xml version="1.0"?>'."\n".$xml;
         $length = strlen($xml);
         header('Connection: close');
         header('Content-Length: '.$length);
-        header('Content-Type: text/xml');
+        if ($charset)
+            header('Content-Type: text/xml; charset='.$charset);
+        else
+            header('Content-Type: text/xml');
         header('Date: '.date('r'));
         echo $xml;