mirror of
https://github.com/moodle/moodle.git
synced 2025-02-13 12:34:28 +01:00
Merge branch 'MDL-30033' of git://github.com/timhunt/moodle
This commit is contained in:
commit
9bceddfa2b
@ -353,6 +353,10 @@ function quiz_feedback_for_grade($grade, $quiz, $context) {
|
|||||||
return '';
|
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',
|
$feedback = $DB->get_record_select('quiz_feedback',
|
||||||
'quizid = ? AND mingrade <= ? AND ? < maxgrade', array($quiz->id, $grade, $grade));
|
'quizid = ? AND mingrade <= ? AND ? < maxgrade', array($quiz->id, $grade, $grade));
|
||||||
|
|
||||||
|
@ -265,6 +265,10 @@ function quiz_report_feedback_for_grade($grade, $quizid, $context) {
|
|||||||
$feedbackcache[$quizid] = $DB->get_records('quiz_feedback', array('quizid' => $quizid));
|
$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];
|
$feedbacks = $feedbackcache[$quizid];
|
||||||
$feedbackid = 0;
|
$feedbackid = 0;
|
||||||
$feedbacktext = '';
|
$feedbacktext = '';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user