Merge branch 'MDL-65777-37' of git://github.com/mihailges/moodle into MOODLE_37_STABLE

mod/assign/feedback/file/importzipform.php

@@ -80,7 +80,7 @@ class assignfeedback_file_import_zip_form extends moodleform implements renderab
             if ($importer->is_valid_filename_for_import($assignment, $unzippedfile, $participants, $user, $plugin, $filename)) {
                 if ($importer->is_file_modified($assignment, $user, $plugin, $filename, $unzippedfile)) {
                     // Get a string we can show to identify this user.
-                    $userdesc = fullname($user);
+                    $userdesc = fullname($user, has_capability('moodle/site:viewfullnames', $assignment->get_context()));
                     $path = pathinfo($filename);
                     if ($assignment->is_blind_marking()) {
                         $userdesc = get_string('hiddenuser', 'assign') .

mod/assign/locallib.php

@@ -3517,7 +3517,8 @@ class assign {
                     $prefix = str_replace('_', ' ', $groupname . get_string('participant', 'assign'));
                     $prefix = clean_filename($prefix . '_' . $this->get_uniqueid_for_user($userid));
                 } else {
-                    $prefix = str_replace('_', ' ', $groupname . fullname($student));
+                    $fullname = fullname($student, has_capability('moodle/site:viewfullnames', $this->get_context()));
+                    $prefix = str_replace('_', ' ', $groupname . $fullname);
                     $prefix = clean_filename($prefix . '_' . $this->get_uniqueid_for_user($userid));
                 }