Merge branch 'MDL-33532_21' of git://github.com/timhunt/moodle into M…

…OODLE_21_STABLE
moodle · Jun 7, 2012 · 965481f · 965481f
2 parents c2cf907 + 40035f0
commit 965481f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -133,6 +133,14 @@
 
 /**
  * PARAM_FLOAT - a real/floating point number.
+ *
+ * Note that you should not use PARAM_FLOAT for numbers typed in by the user.
+ * It does not work for languages that use , as a decimal separator.
+ * Instead, do something like
+ *     $rawvalue = required_param('name', PARAM_RAW);
+ *     // ... other code including require_login, which sets current lang ...
+ *     $realvalue = unformat_float($rawvalue);
+ *     // ... then use $realvalue
  */
 define('PARAM_FLOAT',  'float');
 

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
@@ -318,7 +318,7 @@ function module_specific_controls($totalnumber, $recurse, $category, $cmid, $cmo
         if (preg_match('!^g([0-9]+)$!', $key, $matches)) {
             // Parse input for question -> grades
             $questionid = $matches[1];
-            $quiz->grades[$questionid] = clean_param($value, PARAM_FLOAT);
+            $quiz->grades[$questionid] = unformat_float($value);
             quiz_update_question_instance($quiz->grades[$questionid], $questionid, $quiz);
             $deletepreviews = true;
             $recomputesummarks = true;
@@ -384,8 +384,8 @@ function module_specific_controls($totalnumber, $recurse, $category, $cmid, $cmo
         $deletepreviews = true;
     }
 
-    // If rescaling is required save the new maximum
-    $maxgrade = optional_param('maxgrade', -1, PARAM_FLOAT);
+    // If rescaling is required save the new maximum.
+    $maxgrade = unformat_float(optional_param('maxgrade', -1, PARAM_RAW));
     if ($maxgrade >= 0) {
         quiz_set_grade($maxgrade, $quiz);
     }