Merge branch 'MDL-65250' of git://github.com/stronk7/moodle

diff --git a/course/request.php b/course/request.php
index 34d02d3..e330e1d 100644 (file)
--- a/course/request.php
+++ b/course/request.php
@@ -53,7 +53,7 @@ require_capability('moodle/course:request', $context);
 
 // Set up the form.
 $data = course_request::prepare();
-$requestform = new course_request_form($url, compact('editoroptions'));
+$requestform = new course_request_form($url);
 $requestform->set_data($data);
 
 $strtitle = get_string('courserequest');

diff --git a/mod/scorm/report/interactions/classes/report.php b/mod/scorm/report/interactions/classes/report.php
index 41c19fe..f20b8c1 100644 (file)
--- a/mod/scorm/report/interactions/classes/report.php
+++ b/mod/scorm/report/interactions/classes/report.php
@@ -643,7 +643,7 @@ class report extends \mod_scorm\report {
             }
             // Show preferences form irrespective of attempts are there to report or not.
             if (!$download) {
-                $mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
+                $mform->set_data(compact('pagesize', 'attemptsmode'));
                 $mform->display();
             }
             if ($download == 'Excel' or $download == 'ODS') {

diff --git a/mod/scorm/report/objectives/classes/report.php b/mod/scorm/report/objectives/classes/report.php
index c8f889a..3f4f99c 100644 (file)
--- a/mod/scorm/report/objectives/classes/report.php
+++ b/mod/scorm/report/objectives/classes/report.php
@@ -642,7 +642,7 @@ class report extends \mod_scorm\report {
             }
             // Show preferences form irrespective of attempts are there to report or not.
             if (!$download) {
-                $mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
+                $mform->set_data(compact('pagesize', 'attemptsmode'));
                 $mform->display();
             }
             if ($download == 'Excel' or $download == 'ODS') {