Merge branch 'MDL-36856' of git://github.com/kastashov/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:04:22 +0000 (14:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:04:22 +0000 (14:04 +0800)
mod/assign/feedback/file/importzipform.php
mod/assign/feedback/offline/importgradesform.php

index c3338b3..a5aad69 100644 (file)
@@ -83,7 +83,7 @@ class assignfeedback_file_import_zip_form extends moodleform implements renderab
                     $userdesc = fullname($user);
                     if ($assignment->is_blind_marking()) {
                         $userdesc = get_string('hiddenuser', 'assign') .
-                                    $assignment->get_unique_id_for_user($user->id);
+                                    $assignment->get_uniqueid_for_user($user->id);
                     }
                     $grade = $assignment->get_user_grade($user->id, false);
 
index 326dc5a..baba18d 100644 (file)
@@ -92,7 +92,7 @@ class assignfeedback_offline_import_grades_form extends moodleform implements re
             $modified = $record->modified;
             $userdesc = fullname($user);
             if ($assignment->is_blind_marking()) {
-                $userdesc = get_string('hiddenuser', 'assign') . $assignment->get_unique_id_for_user($user->id);
+                $userdesc = get_string('hiddenuser', 'assign') . $assignment->get_uniqueid_for_user($user->id);
             }
 
             $usergrade = $assignment->get_user_grade($user->id, false);