From: Fomafix <fomafix@googlemail.com>
Date: Tue, 3 Jul 2018 20:14:06 +0000 (+0200)
Subject: Use $lang->hasVariants() instead of count( $lang->getVariants() ) > 1
X-Git-Tag: 1.34.0-rc.0~4813
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=88f469624df1c65546d923e62b4550415826c458;p=lhc%2Fweb%2Fwiklou.git

Use $lang->hasVariants() instead of count( $lang->getVariants() ) > 1

Change-Id: I23668c69a8d8cc886168cbbd4f94cf13b597b5a6
---

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index b11239a1ca..a67cb9bf47 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -90,7 +90,7 @@ class MediaWiki {
 			}
 			// Check variant links so that interwiki links don't have to worry
 			// about the possible different language variants
-			if ( count( $wgContLang->getVariants() ) > 1
+			if ( $wgContLang->hasVariants()
 				&& !is_null( $ret ) && $ret->getArticleID() == 0
 			) {
 				$wgContLang->findVariantLink( $title, $ret );
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index a32b2884fe..ea2a85fb1e 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -1200,7 +1200,7 @@ class ApiPageSet extends ApiBase {
 				// Variants checking
 				global $wgContLang;
 				if ( $this->mConvertTitles &&
-					count( $wgContLang->getVariants() ) > 1 &&
+					$wgContLang->hasVariants() &&
 					!$titleObj->exists()
 				) {
 					// Language::findVariantLink will modify titleText and titleObj into
diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index bcd15b3b9f..8c113f4e59 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -444,12 +444,11 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 		if ( !$this->config->get( 'DisableLangConversion' ) ) {
 			foreach ( LanguageConverter::$languagesWithVariants as $langCode ) {
 				if ( $langCode == $this->contLang->getCode() ) {
-					$variants = $this->contLang->getVariants();
-
-					if ( count( $variants ) <= 1 ) {
+					if ( !$this->contLang->hasVariants() ) {
 						continue;
 					}
 
+					$variants = $this->contLang->getVariants();
 					$variantArray = [];
 					foreach ( $variants as $v ) {
 						$v = str_replace( '_', '-', strtolower( $v ) );
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 7fc0c3a3bb..7b2d79ebad 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -1116,11 +1116,11 @@ class SkinTemplate extends Skin {
 
 			if ( $userCanRead && !$wgDisableLangConversion ) {
 				$pageLang = $title->getPageLanguage();
-				// Gets list of language variants
-				$variants = $pageLang->getVariants();
 				// Checks that language conversion is enabled and variants exist
 				// And if it is not in the special namespace
-				if ( count( $variants ) > 1 ) {
+				if ( $pageLang->hasVariants() ) {
+					// Gets list of language variants
+					$variants = $pageLang->getVariants();
 					// Gets preferred variant (note that user preference is
 					// only possible for wiki content language variant)
 					$preferred = $pageLang->getPreferredVariant();
diff --git a/maintenance/language/listVariants.php b/maintenance/language/listVariants.php
index 4098e0cd8c..264ef5bbb8 100644
--- a/maintenance/language/listVariants.php
+++ b/maintenance/language/listVariants.php
@@ -42,7 +42,7 @@ class ListVariants extends Maintenance {
 		$variants = [];
 		foreach ( LanguageConverter::$languagesWithVariants as $langCode ) {
 			$lang = Language::factory( $langCode );
-			if ( count( $lang->getVariants() ) > 1 ) {
+			if ( $lang->hasVariants() ) {
 				$variants += array_flip( $lang->getVariants() );
 				$variantLangs[$langCode] = $lang->getVariants();
 			}