Restoring from courses having custom role name doesn't cause duplicate roles. MDL...

diff --git a/backup/restore_form.html b/backup/restore_form.html
index a6c5e4e58561818ab50334f2f6d4fc7d2d962f37..f74428ba1172d66b1d1d5924c6a0920b24a654e3 100644 (file)
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -599,8 +599,8 @@ $xml_file  = $CFG->dataroot."/temp/backup/".$backup_unique_code."/moodle.xml";
 $info = restore_read_xml_info($xml_file);
 
 // fix for MDL-9068, front page course is just a normal course
-$siterolesarray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "shortname");
-$siterolesnamearray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "name");
+$siterolesarray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "shortname", ROLENAME_ORIGINAL);
+$siterolesnamearray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "name", ROLENAME_ORIGINAL);
 $allroles = get_records('role');
 
 echo ('<table width="100%" class="restore-form-instances">');