From 26c355f874c67cfd7e0f1d40bcc8a645c1ac5c72 Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Wed, 5 Dec 2007 02:59:44 +0000
Subject: [PATCH] MDL-12435, cancel in preferences form doesn't work

---
 grade/report/grader/preferences.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php
index d687f21419..4402087074 100644
--- a/grade/report/grader/preferences.php
+++ b/grade/report/grader/preferences.php
@@ -41,8 +41,15 @@ $context = get_context_instance(CONTEXT_COURSE, $course->id);
 $systemcontext = get_context_instance(CONTEXT_SYSTEM);
 require_capability('gradereport/grader:view', $context);
 
+require('preferences_form.php');
+$mform = new grader_report_preferences_form('preferences.php', compact('course'));
+
+if ($mform->is_cancelled()){
+    redirect($CFG->wwwroot . '/grade/report/grader/index.php?id='.$courseid);
+}
+
 // If data submitted, then process and store.
-if ($data = data_submitted()) {
+if ($data = $mform->get_data()) {
     foreach ($data as $preference => $value) {
         if (substr($preference, 0, 6) !== 'grade_') {
             continue;
@@ -84,9 +91,7 @@ if (has_capability('moodle/site:config', $systemcontext)) {
 
 print_simple_box_start("center");
 
-require('preferences_form.php');
-$mform = new grader_report_preferences_form('preferences.php', compact('course'));
-echo $mform->display();
+$mform->display();
 print_simple_box_end();
 
 print_footer($course);
-- 
2.39.5