Jeroen De Dauw has submitted this change and it was merged. Change subject: Filter and sort $wgBabelCategoryNames correctly for Babel extraction ......................................................................
Filter and sort $wgBabelCategoryNames correctly for Babel extraction Change-Id: Iaf08f4448d1a9f5141717684b6794e418f1262f6 --- M lib/includes/LanguageFallbackChainFactory.php 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jeroen De Dauw: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/includes/LanguageFallbackChainFactory.php b/lib/includes/LanguageFallbackChainFactory.php index fa7fb01..5ce24a8 100644 --- a/lib/includes/LanguageFallbackChainFactory.php +++ b/lib/includes/LanguageFallbackChainFactory.php @@ -239,7 +239,11 @@ if ( count( $wgBabelCategoryNames ) ) { // A little redundant but it's the only way to get required information with current Babel API. $previousLevelBabel = array(); - foreach ( $wgBabelCategoryNames as $level => $_ ) { + $babelCategoryNames = array_filter( $wgBabelCategoryNames, function( $category ) { + return $category !== false; + } ); + krsort( $babelCategoryNames ); + foreach ( $babelCategoryNames as $level => $_ ) { // Make the current language at the top of the chain. $levelBabel = array_unique( array_merge( $contextLanguage, \Babel::getUserLanguages( $user, $level ) -- To view, visit https://gerrit.wikimedia.org/r/79180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf08f4448d1a9f5141717684b6794e418f1262f6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Liangent <liang...@gmail.com> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Denny Vrandecic <denny.vrande...@wikimedia.de> Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits