Merge branch 'MDL-28686' of git://github.com/bostelm/moodle

diff --git a/question/engine/upgrade/upgradelib.php b/question/engine/upgrade/upgradelib.php
index 5ba8e1c..6f0aac8 100644 (file)
--- a/question/engine/upgrade/upgradelib.php
+++ b/question/engine/upgrade/upgradelib.php
@@ -342,6 +342,15 @@ class question_engine_attempt_upgrader {
     }
 
     protected function get_converter_class_name($question, $quiz, $qsessionid) {
+        global $DB;
+        if ($question->qtype == 'deleted') {
+            $where = '(question = :questionid OR '.$DB->sql_like('answer', ':randomid').') AND event = 7';
+            $params = array('questionid'=>$question->id, 'randomid'=>"random{$question->id}-%");
+            if ($DB->record_exists_select('question_states', $where, $params)) {
+                $this->logger->log_assumption("Assuming that deleted question {$question->id} was manually graded.");
+                return 'qbehaviour_manualgraded_converter';
+            }
+        }
         if ($question->qtype == 'essay') {
             return 'qbehaviour_manualgraded_converter';
         } else if ($question->qtype == 'description') {