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

2011-11-17 00:08:40 +01:00
parent 373c70e5d5 5255100dac
commit 96ec3502f0
1 changed files with 1 additions and 1 deletions
@@ -264,7 +264,7 @@ class qtype_numerical_edit_form extends question_edit_form {
                if ($data['fraction'][$key] == 1) {
                    $maxgrade = true;
                }
-                if (!is_numeric($data['tolerance'][$key])) {
+                if ($answer !== '*' && !is_numeric($data['tolerance'][$key])) {
                    $errors['tolerance['.$key.']'] =
                            get_string('mustbenumeric', 'qtype_calculated');
                }