Merge branch 'MDL-37114' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 07:25:22 +0000 (15:25 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 07:25:22 +0000 (15:25 +0800)
mod/quiz/mod_form.php

index 929b321..e40de89 100644 (file)
@@ -522,11 +522,16 @@ class mod_quiz_mod_form extends moodleform_mod {
         $i = 0;
         while (!empty($data['feedbackboundaries'][$i] )) {
             $boundary = trim($data['feedbackboundaries'][$i]);
-            if (strlen($boundary) > 0 && $boundary[strlen($boundary) - 1] == '%') {
-                $boundary = trim(substr($boundary, 0, -1));
-                if (is_numeric($boundary)) {
-                    $boundary = $boundary * $data['grade'] / 100.0;
-                } else {
+            if (strlen($boundary) > 0) {
+                if ($boundary[strlen($boundary) - 1] == '%') {
+                    $boundary = trim(substr($boundary, 0, -1));
+                    if (is_numeric($boundary)) {
+                        $boundary = $boundary * $data['grade'] / 100.0;
+                    } else {
+                        $errors["feedbackboundaries[$i]"] =
+                                get_string('feedbackerrorboundaryformat', 'quiz', $i + 1);
+                    }
+                } else if (!is_numeric($boundary)) {
                     $errors["feedbackboundaries[$i]"] =
                             get_string('feedbackerrorboundaryformat', 'quiz', $i + 1);
                 }