Merge branch 'MDL-28202_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

2011-09-26 22:28:47 +02:00
parent 4d7a9cd8f5 18d81bdb3c
commit 0518140c31
1 changed files with 6 additions and 0 deletions
@@ -1893,6 +1893,12 @@ function qtype_calculated_calculate_answer($formula, $individualdata,
        // ... and have the answer rounded of to the correct length
        $answer = round($answer, $answerlength);

+        //if we rounded up to 1.0, place the answer back into 0.[1-9][0-9]* format
+        if ($answer >= 1) {
+            ++$p10;
+            $answer /= 10;
+        }
+
        // Have the answer written on a suitable format,
        // Either scientific or plain numeric
        if (-2 > $p10 || 4 < $p10) {