From: Tom Gilder <tomgilder@users.mediawiki.org>
Date: Mon, 7 Feb 2005 14:03:02 +0000 (+0000)
Subject: Fix classic skins sent as application/xhtml+xml (bug 1480); also stop xml:lang being... 
X-Git-Tag: 1.5.0alpha1~759
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=fb4eb319cfd50ec3badfa0ca3d2d9e503c67830c;p=lhc%2Fweb%2Fwiklou.git

Fix classic skins sent as application/xhtml+xml (bug 1480); also stop xml:lang being hard-coded to en
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 42c981f265..96543bac23 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -729,7 +729,7 @@ class OutputPage {
 		global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType;
 		global $wgUser, $wgContLang, $wgRequest;
 
-		$xml = ($wgMimeType == 'text/xml');
+		$xml = ($wgMimeType == 'text/xml' || $wgMimeType == 'application/xhtml+xml' || $wgMimeType == 'application/xml');
 		if( $xml ) {
 			$ret = "<" . "?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
 		} else {
@@ -742,7 +742,7 @@ class OutputPage {
 			$this->mHTMLtitle = wfMsg( "pagetitle", $this->mPagetitle );
 		}
 		if( $xml ) {
-			$xmlbits = "xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"";
+			$xmlbits = "xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"$wgContLanguageCode\"";
 		} else {
 			$xmlbits = '';
 		}