Merge pull request #16258 from samuelsov/i18ncountriesorder

Country/State PseudoConstant not sorted according to the locale
civicrm · Jan 9, 2020 · 1d94337 · 1d94337
2 parents f7ed7c9 + 0fc9c45
commit 1d94337
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
@@ -358,7 +358,7 @@ public static function get($daoName, $fieldName, $params = [], $context = NULL)
             $i18n->localizeArray($output, $I18nParams);
             // Maintain sort by label
             if ($order == "ORDER BY %2") {
-              CRM_Utils_Array::asort($output);
+              $output = CRM_Utils_Array::asort($output);
             }
           }
           CRM_Utils_Hook::fieldOptions($entity, $fieldName, $output, $params);