MDL-17248 fixed incorrect sum when scales involved; merged from MOODLE_19_STABLE...

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index db7816258c71b833cd48e5c262ce02ea836a299d..40833af366fd088dc0792f570fd050f8bc81a97d 100644 (file)
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -731,7 +731,7 @@ class grade_category extends grade_object {
             if ($item->gradetype == GRADE_TYPE_VALUE) {
                 $max += $item->grademax;
             } else if ($item->gradetype == GRADE_TYPE_SCALE) {
-                $max += $item->grademax - 1; // scales min is 1
+                $max += $item->grademax; // 0 = nograde, 1 = first scale item, 2 = second scale item
             }
         }