From 029870ee95dbc528e9842aba701946fff61bae6d Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Fri, 7 Feb 2014 22:13:44 +0000
Subject: [PATCH] MDL-44053 question restore from 2.0: fix regression from
 MDL-43670

---
 question/engine/upgrade/upgradelib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/question/engine/upgrade/upgradelib.php b/question/engine/upgrade/upgradelib.php
index f24e30dd189..4e21fe39772 100644
--- a/question/engine/upgrade/upgradelib.php
+++ b/question/engine/upgrade/upgradelib.php
@@ -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));
         }