From 6a2f8c11930cedad1511be27ecb81b2f93044ab4 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 10 Sep 2008 13:39:24 +0000
Subject: [PATCH] * (bug 15497) Removed encoding attribute from <?xml ?> tags

---
 RELEASE-NOTES                  | 1 +
 includes/Feed.php              | 2 +-
 includes/api/ApiFormatWddx.php | 2 +-
 includes/api/ApiFormatXml.php  | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e953e65e38..f6c0c35186 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -188,6 +188,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 15292) New message notification for unregistred users now works again
 * (bug 14398) mwsuggest.js: Let width of container be configurable
 * (bug 15543) Only include user touched timestamp to generated CSS
+* (bug 15497) Removed encoding attribute from <?xml ?> tag
 
 
 === API changes in 1.14 ===
diff --git a/includes/Feed.php b/includes/Feed.php
index 21e8f084f5..b702f8683a 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -146,7 +146,7 @@ class ChannelFeed extends FeedItem {
 		global $wgStylePath, $wgStyleVersion;
 
 		$this->httpHeaders();
-		echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
+		echo '<?xml version="1.0"?>' . "\n";
 		echo '<?xml-stylesheet type="text/css" href="' .
 			htmlspecialchars( wfExpandUrl( "$wgStylePath/common/feed.css?$wgStyleVersion" ) ) .
 			'"?' . ">\n";
diff --git a/includes/api/ApiFormatWddx.php b/includes/api/ApiFormatWddx.php
index 4d6274fdf4..d7e48c08a0 100644
--- a/includes/api/ApiFormatWddx.php
+++ b/includes/api/ApiFormatWddx.php
@@ -45,7 +45,7 @@ class ApiFormatWddx extends ApiFormatBase {
 		if (function_exists('wddx_serialize_value')) {
 			$this->printText(wddx_serialize_value($this->getResultData()));
 		} else {
-			$this->printText('<?xml version="1.0" encoding="utf-8"?>');
+			$this->printText('<?xml version="1.0"?>');
 			$this->printText('<wddxPacket version="1.0"><header/><data>');
 			$this->slowWddxPrinter($this->getResultData());
 			$this->printText('</data></wddxPacket>');
diff --git a/includes/api/ApiFormatXml.php b/includes/api/ApiFormatXml.php
index b1194171bc..6f0bb3f1af 100644
--- a/includes/api/ApiFormatXml.php
+++ b/includes/api/ApiFormatXml.php
@@ -56,12 +56,12 @@ class ApiFormatXml extends ApiFormatBase {
 		$params = $this->extractRequestParams();
 		$this->mDoubleQuote = $params['xmldoublequote'];
 
-		$this->printText('<?xml version="1.0" encoding="utf-8"?>');
+		$this->printText('<?xml version="1.0"?>');
 		$this->recXmlPrint($this->mRootElemName, $this->getResultData(), $this->getIsHtml() ? -2 : null);
 	}
 
 	/**
-	* This method takes an array and converts it into an xml.
+	* This method takes an array and converts it to XML.
 	* There are several noteworthy cases:
 	*
 	*  If array contains a key '_element', then the code assumes that ALL other keys are not important and replaces them with the value['_element'].
-- 
2.20.1