diff --git a/core/lib/Drupal/Component/Utility/SortArray.php b/core/lib/Drupal/Component/Utility/SortArray.php index a8d9f00..0efacfe 100644 --- a/core/lib/Drupal/Component/Utility/SortArray.php +++ b/core/lib/Drupal/Component/Utility/SortArray.php @@ -114,7 +114,7 @@ public static function sortByWeightAndTitleKey($a, $b, $weight_key = 'weight', $ $weight_cmp = static::sortByKeyInt($a, $b, $weight_key); if ($weight_cmp === 0) { - return static::sortByKeyString($a, $b, $title_key); + return -1; } return $weight_cmp; diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index 76f7cbb..96ac98e 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -220,7 +220,7 @@ public function setNegotiationMethodId($method_id) { */ public static function sort(&$languages) { uasort($languages, function ($a, $b) { - return SortArray::sortByWeightAndTitleKey($a, $b, 'weight', 'name'); + return SortArray::sortByWeightAndTitleKey($a, $b, 'weight', 'label'); }); }