MDL-52811 course: moodle/course:setforcedlanguage integration fixes

moodle · Feb 5, 2018 · 4ee8ec3 · 4ee8ec3
1 parent 4a9624a
commit 4ee8ec3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/admin/tool/uploadcourse/tests/course_test.php b/admin/tool/uploadcourse/tests/course_test.php
@@ -266,7 +266,7 @@ public function test_data_saved() {
         global $DB;
         $this->resetAfterTest(true);
 
-        cron_setup_user(); // To avoid warnings related to 'moodle/course:setforcedlanguage' capability check.
+        $this->setAdminUser(); // To avoid warnings related to 'moodle/course:setforcedlanguage' capability check.
 
         // Create.
         $mode = tool_uploadcourse_processor::MODE_CREATE_NEW;

diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
@@ -1827,7 +1827,7 @@ public function process_course($data) {
         // When restoring to a new course we can set all the things except for the ID number.
         $canchangeidnumber = $isnewcourse || has_capability('moodle/course:changeidnumber', $context, $userid);
         $canchangesummary = $isnewcourse || has_capability('moodle/course:changesummary', $context, $userid);
-        $canforcelanguage = has_capability('moodle/course:setforcedlanguage', $context);
+        $canforcelanguage = has_capability('moodle/course:setforcedlanguage', $context, $userid);
 
         $data = (object)$data;
         $data->id = $this->get_courseid();