MDL-10702 fixing handling of slashes in grade forms

diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php
index a3855dd252d7e34bcd4d3666b4fae01f97ae7b36..b9d7f2328d1b75df88d3efd0fa9c50e7659cfad5 100644 (file)
--- a/grade/edit/tree/calculation.php
+++ b/grade/edit/tree/calculation.php
@@ -39,7 +39,7 @@ if ($mform->is_cancelled()) {
 $calculation = grade_item::denormalize_formula($grade_item->calculation, $grade_item->courseid);
 $mform->set_data(array('courseid'=>$grade_item->courseid, 'calculation'=>$calculation, 'id'=>$grade_item->id, 'itemname'=>$grade_item->itemname));
 
-if ($data = $mform->get_data()) {
+if ($data = $mform->get_data(false)) {
     $grade_item->set_calculation($data->calculation);
     redirect($returnurl);
 }

diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
index fd832ac04de316c188bd05954382a2f6afc44252..f755603ca6dd107c36b184da571f75e48b7384f8 100644 (file)
--- a/grade/edit/tree/category.php
+++ b/grade/edit/tree/category.php
@@ -34,7 +34,7 @@ if ($category = get_record('grade_categories', 'id', $id, 'courseid', $course->i
 if ($mform->is_cancelled()) {
     redirect($returnurl);
 
-} else if ($data = $mform->get_data()) {
+} else if ($data = $mform->get_data(false)) {
     $grade_category = new grade_category(array('id'=>$id, 'courseid'=>$course->id));
     grade_category::set_properties($grade_category, $data);
 

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index 09cdfed6005e880c44780d9f2c8b62cacb4a0303..3b5fd65e376aa0e693612723e2a206951169a92d 100644 (file)
--- a/grade/edit/tree/grade.php
+++ b/grade/edit/tree/grade.php
@@ -82,7 +82,7 @@ if ($mform->is_cancelled()) {
     redirect($returnurl);
 
 // form processing
-} else if ($data = $mform->get_data()) {
+} else if ($data = $mform->get_data(false)) {
     $old_grade_grade = new grade_grade(array('userid'=>$data->userid, 'itemid'=>$grade_item->id), true); //might not exist yet
 
     // update final grade or feedback
@@ -90,7 +90,7 @@ if ($mform->is_cancelled()) {
 
     $grade_grade = grade_grade::fetch(array('userid'=>$data->userid, 'itemid'=>$grade_item->id));
 
-    $grade_grade->set_hidden($data->hidden); // TODO: this is wrong!
+    $grade_grade->set_hidden($data->hidden); // TODO: this is wrong - hidden might be a data to hide until
 
     // ignore overridden flag when changing final grade
     if ($old_grade_grade->finalgrade == $grade_grade->finalgrade) {

diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
index 18f4abefd11d710bd42c7de08069af3fe1feae16..9c6ff88d903cd989e43e24e7ba69bf18223f5091 100644 (file)
--- a/grade/edit/tree/item.php
+++ b/grade/edit/tree/item.php
@@ -41,7 +41,7 @@ if ($item = get_record('grade_items', 'id', $id, 'courseid', $course->id)) {
     $mform->set_data($item);
 }
 
-if ($data = $mform->get_data()) {
+if ($data = $mform->get_data(false)) {
     if (array_key_exists('calculation', $data)) {
         $data->calculation = grade_item::normalize_formula($data->calculation, $course->id);
     }

diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
index 4dc7bd37924d04ef45493b451a18a5fffb7e420b..8101f2e52ffa778a745d39849942f616f1e2d906 100644 (file)
--- a/grade/edit/tree/outcomeitem.php
+++ b/grade/edit/tree/outcomeitem.php
@@ -46,7 +46,7 @@ if ($item = get_record('grade_items', 'id', $id, 'courseid', $course->id)) {
     $mform->set_data($item);
 }
 
-if ($data = $mform->get_data()) {
+if ($data = $mform->get_data(false)) {
     if (array_key_exists('calculation', $data)) {
         $data->calculation = grade_item::normalize_formula($data->calculation, $course->id);
     }