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

This commit is contained in:
Eloy Lafuente (stronk7)
2014-02-10 16:48:26 +01:00
+3 -3
View File
@@ -465,10 +465,10 @@ class question_engine_upgrade_question_loader {
if ($quizid) {
$question = $DB->get_record_sql("
SELECT q.*, qqi.grade AS maxmark
SELECT q.*, qqi.maxmark
FROM {question} q
JOIN {quiz_question_instances} qqi ON qqi.question = q.id
WHERE q.id = $questionid AND qqi.quiz = $quizid");
JOIN {quiz_question_instances} qqi ON qqi.questionid = q.id
WHERE q.id = ? AND qqi.quizid = ?", array($questionid, $quizid));
} else {
$question = $DB->get_record('question', array('id' => $questionid));
}