From c5c66d5c15a445d524a1606e62a3cfb6eff5c5a7 Mon Sep 17 00:00:00 2001 From: Liangent Date: Wed, 17 Apr 2013 12:01:16 +0800 Subject: [PATCH] Clean up old way to disable variants (using a special name 'disable') $wgDisabledVariants is the preferred setting now since 1.16. For some reason, the 'disable' magic name hasn't been cleaned up completely and only affects skinning. Someone may want to run rebuildLanguage.php later because messages.inc is modified here. I didn't run it because it introduces too many unrelated edits messing up this patch. Change-Id: Ifb005e7cc9efd0b4a4f87fd491a71c8d5e1a5748 --- includes/SkinLegacy.php | 3 --- includes/SkinTemplate.php | 5 ----- maintenance/language/messages.inc | 2 -- 3 files changed, 10 deletions(-) diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php index 9d657f7b71..ca49024840 100644 --- a/includes/SkinLegacy.php +++ b/includes/SkinLegacy.php @@ -218,9 +218,6 @@ class LegacyTemplate extends BaseTemplate { foreach ( $variants as $code ) { $varname = $lang->getVariantname( $code ); - if ( $varname == 'disable' ) { - continue; - } $s = $wgLang->pipeList( array( $s, '' . htmlspecialchars( $varname ) . '' diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 9014c7fe75..17ec88aead 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -1021,11 +1021,6 @@ class SkinTemplate extends Skin { foreach( $variants as $code ) { // Gets variant name from language code $varname = $pageLang->getVariantname( $code ); - // Checks if the variant is marked as disabled - if( $varname == 'disable' ) { - // Skips this variant - continue; - } // Appends variant link $content_navigation['variants'][] = array( 'class' => ( $code == $preferred ) ? 'selected' : false, diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index b7ad6957ab..39083f9e3c 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -3975,8 +3975,6 @@ XHTML id names.", 'video-info' => 'Video information, used by Language::formatTimePeriod() to format lengths in the above messages', 'badimagelist' => 'Bad image list', 'variantname-zh' => "Short names for language variants used for language conversion links. -To disable showing a particular link, set it to 'disable', e.g. -'variantname-zh-sg' => 'disable', Variants for Chinese language", 'variantname-gan' => 'Variants for Gan language', 'variantname-sr' => 'Variants for Serbian language', -- 2.20.1