Merge branch 'MDL-70459-311' of git://github.com/rezaies/moodle into MOODLE_311_STABLE

enrol/fee/classes/plugin.php

@@ -45,6 +45,10 @@ class enrol_fee_plugin extends enrol_plugin {
             $currencies[$c] = new lang_string($c, 'core_currencies');
         }
 
+        uasort($currencies, function($a, $b) {
+            return strcmp($a, $b);
+        });
+
         return $currencies;
     }
 

payment/classes/helper.php

@@ -49,7 +49,7 @@ class helper {
             /** @var \paygw_paypal\gateway $classname */
             $classname = '\paygw_' . $plugin . '\gateway';
 
-            $currencies += component_class_callback($classname, 'get_supported_currencies', [], []);
+            $currencies = array_merge($currencies, component_class_callback($classname, 'get_supported_currencies', [], []));
         }
 
         $currencies = array_unique($currencies);