| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1971,8 +1971,8 @@ |
| 1972 | 1972 | /** Whether to enable language variant conversion for links. */ |
| 1973 | 1973 | $wgDisableTitleConversion = false; |
| 1974 | 1974 | |
| 1975 | | -/** Whether to enable language cononical in meta data. */ |
| 1976 | | -$wgDisableLangCanonical = false; |
| | 1975 | +/** Whether to enable cononical language links in meta data. */ |
| | 1976 | +$wgCanonicalLanguageLinks = true; |
| 1977 | 1977 | |
| 1978 | 1978 | /** Default variant code, if false, the default will be the language code */ |
| 1979 | 1979 | $wgDefaultLanguageVariant = false; |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -277,7 +277,7 @@ |
| 278 | 278 | */ |
| 279 | 279 | function addMetadataLinks( OutputPage $out ) { |
| 280 | 280 | global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf; |
| 281 | | - global $wgDisableLangConversion, $wgDisableLangCanonical, $wgContLang; |
| | 281 | + global $wgDisableLangConversion, $wgCanonicalLanguageLinks, $wgContLang; |
| 282 | 282 | global $wgRightsPage, $wgRightsUrl; |
| 283 | 283 | |
| 284 | 284 | if ( $out->isArticleRelated() ) { |
| — | — | @@ -299,7 +299,7 @@ |
| 300 | 300 | } |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | | - if ( !$wgDisableLangConversion && !$wgDisableLangCanonical |
| | 303 | + if ( !$wgDisableLangConversion && !$wgCanonicalLanguageLinks |
| 304 | 304 | && $wgContLang->hasVariants() ) { |
| 305 | 305 | |
| 306 | 306 | $urlvar = $wgContLang->getURLVariant(); |