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

moodle · Feb 10, 2014 · 395988e · 395988e
2 parents 396548f + 029870e
commit 395988e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/question/engine/upgrade/upgradelib.php b/question/engine/upgrade/upgradelib.php
@@ -465,10 +465,10 @@ protected function load_question($questionid, $quizid) {
 
         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));
         }