Merge branch 'MDL-30033' of git://github.com/timhunt/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2012-01-24 00:09:12 +01:00
commit 9bceddfa2b
2 changed files with 8 additions and 0 deletions

View File

@ -353,6 +353,10 @@ function quiz_feedback_for_grade($grade, $quiz, $context) {
return '';
}
// With CBM etc, it is possible to get -ve grades, which would then not match
// any feedback. Therefore, we replace -ve grades with 0.
$grade = max($grade, 0);
$feedback = $DB->get_record_select('quiz_feedback',
'quizid = ? AND mingrade <= ? AND ? < maxgrade', array($quiz->id, $grade, $grade));

View File

@ -265,6 +265,10 @@ function quiz_report_feedback_for_grade($grade, $quizid, $context) {
$feedbackcache[$quizid] = $DB->get_records('quiz_feedback', array('quizid' => $quizid));
}
// With CBM etc, it is possible to get -ve grades, which would then not match
// any feedback. Therefore, we replace -ve grades with 0.
$grade = max($grade, 0);
$feedbacks = $feedbackcache[$quizid];
$feedbackid = 0;
$feedbacktext = '';