From cd536c6be5c5d1a5ad8d5b59335112d0f0504d32 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew@moodle.com>
Date: Wed, 6 Feb 2013 15:57:48 +0800
Subject: [PATCH] MDL-32076 core_grade: fixed handling of unlimited grades

---
 grade/report/grader/ajax_callbacks.php | 11 +++++++----
 grade/report/grader/lib.php            |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/grade/report/grader/ajax_callbacks.php b/grade/report/grader/ajax_callbacks.php
index 034ef18c2dc..6c120634774 100644
--- a/grade/report/grader/ajax_callbacks.php
+++ b/grade/report/grader/ajax_callbacks.php
@@ -81,10 +81,13 @@ switch ($action) {
                 // Warn if the grade is out of bounds.
                 if (is_null($finalgrade)) {
                     // ok
-                } else if ($finalgrade < $grade_item->grademin) {
-                    $errorstr = 'lessthanmin';
-                } else if ($finalgrade > $grade_item->grademax) {
-                    $errorstr = 'morethanmax';
+                } else {
+                    $bounded = $grade_item->bounded_grade($finalgrade);
+                    if ($bounded > $finalgrade) {
+                        $errorstr = 'lessthanmin';
+                    } else if ($bounded < $finalgrade) {
+                        $errorstr = 'morethanmax';
+                    }
                 }
 
                 if ($errorstr) {
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 9f0eabba7f3..2c653a88722 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -256,7 +256,7 @@ class grade_report_grader extends grade_report {
                         } else {
                             $bounded = $gradeitem->bounded_grade($finalgrade);
                             if ($bounded > $finalgrade) {
-                            $errorstr = 'lessthanmin';
+                                $errorstr = 'lessthanmin';
                             } else if ($bounded < $finalgrade) {
                                 $errorstr = 'morethanmax';
                             }