Merge branch 'MDL-64484-37' of https://github.com/paulholden/moodle into MOODLE_37_STABLE

Author: stronk7

user/filters/profilefield.php

@@ -74,7 +74,8 @@ public function get_operators() {
      */
     public function get_profile_fields() {
         global $DB;
-        if (!$fields = $DB->get_records_menu('user_info_field', null, 'name', 'id, name')) {
+        $order = $DB->sql_order_by_text('name');
+        if (!$fields = $DB->get_records_menu('user_info_field', null, $order, 'id, name')) {
             return null;
         }
         $res = array(0 => get_string('anyfield', 'filters'));