quiz editing: MDL-19199 merged from HEAD. 2.0 can store decimals here, but we should...

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 39abba86c13e39a4caf493e33987767ab9ef8810..46a16e849825ebc8b59b291573b0b691fb4daa90 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -360,7 +360,7 @@ if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
         if (preg_match('!^g([0-9]+)$!', $key, $matches)) {
             /// Parse input for question -> grades
             $questionid = $matches[1];
-            $quiz->grades[$questionid] = $value;
+            $quiz->grades[$questionid] = clean_param($value, PARAM_FLOAT);
             quiz_update_question_instance($quiz->grades[$questionid], $questionid, $quiz->id);
             quiz_delete_previews($quiz);
             quiz_update_sumgrades($quiz);
@@ -370,6 +370,7 @@ if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
             $questionid = $matches[2];
             // Make sure two questions don't overwrite each other. If we get a second
             // question with the same position, shift the second one along to the next gap.
+            $value = clean_param($value, PARAM_INTEGER);
             while (array_key_exists($value, $questions)) {
                 $value++;
             }
@@ -417,7 +418,7 @@ if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
     }
 
     // If rescaling is required save the new maximum
-    $maxgrade = optional_param('maxgrade', -1, PARAM_NUMBER);
+    $maxgrade = optional_param('maxgrade', -1, PARAM_FLOAT);
     if ($maxgrade >= 0) {
         quiz_set_grade($maxgrade, $quiz);
     }