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

2019-06-12 09:01:59 +08:00
parent ae6616a7b1 3703f2eec6
commit 023a8a778f
1 changed files with 3 additions and 5 deletions
@@ -74,14 +74,12 @@ class user_filter_profilefield extends user_filter_type {
     */
    public function get_profile_fields() {
        global $DB;
-        if (!$fields = $DB->get_records('user_info_field', null, 'shortname', 'id,shortname')) {
+        if (!$fields = $DB->get_records_menu('user_info_field', null, 'name', 'id, name')) {
            return null;
        }
        $res = array(0 => get_string('anyfield', 'filters'));
-        foreach ($fields as $k => $v) {
-            $res[$k] = $v->shortname;
-        }
-        return $res;
+
+        return $res + $fields;
    }

    /**