From: stronk7 <stronk7>
Date: Mon, 12 May 2008 22:54:26 +0000 (+0000)
Subject: Restoring from courses having custom role name doesn't cause duplicate roles. MDL... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=095aa2809ee9d4a1c523bd50f099de046d58dba5;p=moodle.git

Restoring from courses having custom role name doesn't cause duplicate roles. MDL-14808 ; merged from 19_STABLE
---

diff --git a/backup/restore_form.html b/backup/restore_form.html
index a6c5e4e585..f74428ba11 100644
--- 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">');