Liangent has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/73413


Change subject: LanguageFallbackChain: Avoid one more unneeded Language 
construction
......................................................................

LanguageFallbackChain: Avoid one more unneeded Language construction

Change-Id: Ia766d7fde8743d42f81317e921172e23100239c5
---
M lib/includes/LanguageFallbackChainFactory.php
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/13/73413/1

diff --git a/lib/includes/LanguageFallbackChainFactory.php 
b/lib/includes/LanguageFallbackChainFactory.php
index 475db4e..1d154c0 100644
--- a/lib/includes/LanguageFallbackChainFactory.php
+++ b/lib/includes/LanguageFallbackChainFactory.php
@@ -134,10 +134,14 @@
                }
 
                if ( $mode & self::FALLBACK_VARIANTS ) {
-                       if ( is_string( $language ) ) {
-                               $language = Language::factory( $language );
+                       if ( !in_array( $languageCode, 
LanguageConverter::$languagesWithVariants ) ) {
+                               $parentLanguage = null;
+                       } else {
+                               if ( is_string( $language ) ) {
+                                       $language = Language::factory( 
$language );
+                               }
+                               $parentLanguage = 
$language->getParentLanguage();
                        }
-                       $parentLanguage = $language->getParentLanguage();
                        if ( $parentLanguage ) {
                                // It's less likely to trigger conversion 
mistakes by converting
                                // zh-tw to zh-hk first instead of converting 
zh-cn to zh-tw.

-- 
To view, visit https://gerrit.wikimedia.org/r/73413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia766d7fde8743d42f81317e921172e23100239c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Liangent <liang...@gmail.com>

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

Reply via email to