From a32d2501c63fc0c6256fb96d92a2cd34812aba8a Mon Sep 17 00:00:00 2001 From: Artiom Neganov Date: Fri, 1 Sep 2017 18:55:26 +0300 Subject: [PATCH] Attempt to order languages --- core/modules/language/src/LanguageNegotiator.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/modules/language/src/LanguageNegotiator.php b/core/modules/language/src/LanguageNegotiator.php index db558992a4..173044eb98 100644 --- a/core/modules/language/src/LanguageNegotiator.php +++ b/core/modules/language/src/LanguageNegotiator.php @@ -198,6 +198,8 @@ public function getNegotiationMethods($type = NULL) { if (isset($type)) { $enabled_methods = $this->getEnabledNegotiators($type); $definitions = array_intersect_key($definitions, $enabled_methods); + // Sort the definitions list by the order of $enabled_methods + $definitions = array_merge($enabled_methods, $definitions); } return $definitions; } -- 2.11.0