mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48655-master' of git://github.com/merrill-oakland/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2015-01-06 11:09:41 +00:00
commit 50808a9a32
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/grade/grade_grade.php
View File

@ -913,8 +913,12 @@ class grade_grade extends grade_object {
return null;
}
// Return null if gradepass == grademin or gradepass is null
if (is_null($this->grade_item->gradepass) || $this->grade_item->gradepass == $this->grade_item->grademin) {
// Return null if gradepass == grademin, gradepass is null, or grade item is a scale and gradepass is 0.
if (is_null($this->grade_item->gradepass)) {
return null;
} else if ($this->grade_item->gradepass == $this->grade_item->grademin) {
return null;
} else if ($this->grade_item->gradetype == GRADE_TYPE_SCALE && !grade_floats_different($this->grade_item->gradepass, 0.0)) {
return null;
}