http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75719

Revision: 75719
Author:   philip
Date:     2010-10-31 15:09:27 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Followup r75617. Fix spelling mistake.

Modified Paths:
--------------
    trunk/phase3/includes/DefaultSettings.php
    trunk/phase3/includes/Skin.php

Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php   2010-10-31 14:28:44 UTC (rev 
75718)
+++ trunk/phase3/includes/DefaultSettings.php   2010-10-31 15:09:27 UTC (rev 
75719)
@@ -1971,8 +1971,8 @@
 /** 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;

Modified: trunk/phase3/includes/Skin.php
===================================================================
--- trunk/phase3/includes/Skin.php      2010-10-31 14:28:44 UTC (rev 75718)
+++ trunk/phase3/includes/Skin.php      2010-10-31 15:09:27 UTC (rev 75719)
@@ -277,7 +277,7 @@
         */
        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 @@
                        }
                }
 
-               if ( !$wgDisableLangConversion && !$wgDisableLangCanonical
+               if ( !$wgDisableLangConversion && !$wgCanonicalLanguageLinks
                        && $wgContLang->hasVariants() ) {
 
                        $urlvar = $wgContLang->getURLVariant();


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to