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

…OODLE_23_STABLE
moodle · Dec 17, 2012 · 4dd8079 · 4dd8079
2 parents 139d78a + d057719
commit 4dd8079
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
@@ -515,11 +515,16 @@ public function validation($data, $files) {
         $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);
                 }