Merge branch 'wip-MDL-38129-master' of git://github.com/marinaglancy/…

…moodle
gjb2048 · Jul 24, 2017 · 6807328 · 6807328
2 parents 7b1c637 + 1ef14a5
commit 6807328
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/grade/lib.php b/grade/lib.php
@@ -191,7 +191,7 @@ public function init() {
                             LEFT JOIN (SELECT * FROM {user_info_data}
                                 WHERE fieldid = :cf$customfieldscount) cf$customfieldscount
                             ON u.id = cf$customfieldscount.userid";
-                    $userfields .= ", cf$customfieldscount.data AS customfield_{$field->shortname}";
+                    $userfields .= ", cf$customfieldscount.data AS customfield_{$field->customid}";
                     $params['cf'.$customfieldscount] = $field->customid;
                     $customfieldscount++;
                 }
@@ -3191,7 +3191,7 @@ public static function get_plugins_export($courseid) {
      */
     public static function get_user_field_value($user, $field) {
         if (!empty($field->customid)) {
-            $fieldname = 'customfield_' . $field->shortname;
+            $fieldname = 'customfield_' . $field->customid;
             if (!empty($user->{$fieldname}) || is_numeric($user->{$fieldname})) {
                 $fieldvalue = $user->{$fieldname};
             } else {