From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Thu, 11 Feb 2010 17:25:10 +0000 (+0000)
Subject: War on xml:lang
X-Git-Tag: 1.31.0-rc.0~37819
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=643866f8b75e4fb9d1a4fcbe6aac602ca0f9566e;hp=e2087f07ca0fa32ba216cf08e89b25025b4d5f2e;p=lhc%2Fweb%2Fwiklou.git

War on xml:lang

There is no reason to use this in HTML in addition to the lang
attribute.  No spec requires it (AFAIK) and it's completely redundant.
---

diff --git a/config/Installer.php b/config/Installer.php
index 501621208b..d60f378a8e 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -112,7 +112,7 @@ $ourdb['oracle'] = array(
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" dir="ltr">
 <head>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow"/>
diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php
index 72e6562601..a55adc5370 100644
--- a/includes/OutputHandler.php
+++ b/includes/OutputHandler.php
@@ -130,7 +130,7 @@ function wfHtmlValidationHandler( $s ) {
 
 	$out = <<<EOT
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" dir="ltr">
 <head>
 <title>HTML validation error</title>
 <style>
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index ef8e3fdd55..0677495ac8 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2113,7 +2113,7 @@ class OutputPage {
 			foreach($wgXhtmlNamespaces as $tag => $ns) {
 				$ret .= "xmlns:{$tag}=\"{$ns}\" ";
 			}
-			$ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" dir=\"$dir\">\n";
+			$ret .= "lang=\"$wgContLanguageCode\" dir=\"$dir\">\n";
 		}
 
 		$ret .= "<head>\n";
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 313a2e329e..d13268ce41 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -314,7 +314,7 @@ class SkinTemplate extends Skin {
 		$lang = $wgLang->getCode();
 		$dir  = $wgLang->getDir();
 		if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
-			$attrs = " lang='$lang' xml:lang='$lang' dir='$dir'";
+			$attrs = " lang='$lang' dir='$dir'";
 
 			$tpl->set( 'userlangattributes', $attrs );
 
diff --git a/includes/templates/NoLocalSettings.php b/includes/templates/NoLocalSettings.php
index 2acc132930..45b758a96f 100644
--- a/includes/templates/NoLocalSettings.php
+++ b/includes/templates/NoLocalSettings.php
@@ -35,7 +35,7 @@ foreach( $topdirs as $dir ){
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<html xmlns='http://www.w3.org/1999/xhtml' lang='en'>
 	<head>
 		<title>MediaWiki <?php echo htmlspecialchars( $wgVersion ) ?></title>
 		<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
diff --git a/includes/templates/PHP4.php b/includes/templates/PHP4.php
index c409a5eb55..b071ebd5a5 100644
--- a/includes/templates/PHP4.php
+++ b/includes/templates/PHP4.php
@@ -27,7 +27,7 @@ if ( preg_match( '!^(.*)/config/[^/]*.php$!', $scriptUrl, $m ) ) {
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<html xmlns='http://www.w3.org/1999/xhtml' lang='en'>
 	<head>
 		<title>MediaWiki <?php echo htmlspecialchars( $wgVersion ); ?></title>
 		<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
