From: Philip Tzou <philip@users.mediawiki.org>
Date: Sun, 31 Oct 2010 15:09:27 +0000 (+0000)
Subject: Followup r75617. Fix spelling mistake.
X-Git-Tag: 1.31.0-rc.0~34192
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=5b5705bbb8b686d459a431b8f8fb83199268134c;p=lhc%2Fweb%2Fwiklou.git

Followup r75617. Fix spelling mistake.
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 55774cd8f8..752a79d6ea 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1971,8 +1971,8 @@ $wgDisableLangConversion = false;
 /** Whether to enable language variant conversion for links. */
 $wgDisableTitleConversion = false;
 
-/** Whether to enable language cononical in meta data. */
-$wgDisableLangCanonical = false;
+/** Whether to enable cononical language links in meta data. */
+$wgCanonicalLanguageLinks = true;
 
 /** Default variant code, if false, the default will be the language code */
 $wgDefaultLanguageVariant = false;
diff --git a/includes/Skin.php b/includes/Skin.php
index 034fa239ba..a70f863a00 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -277,7 +277,7 @@ class Skin extends Linker {
 	 */
 	function addMetadataLinks( OutputPage $out ) {
 		global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
-		global $wgDisableLangConversion, $wgDisableLangCanonical, $wgContLang;
+		global $wgDisableLangConversion, $wgCanonicalLanguageLinks, $wgContLang;
 		global $wgRightsPage, $wgRightsUrl;
 
 		if ( $out->isArticleRelated() ) {
@@ -299,7 +299,7 @@ class Skin extends Linker {
 			}
 		}
 
-		if ( !$wgDisableLangConversion && !$wgDisableLangCanonical
+		if ( !$wgDisableLangConversion && !$wgCanonicalLanguageLinks
 			&& $wgContLang->hasVariants() ) {
 
 			$urlvar = $wgContLang->getURLVariant();