From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Tue, 24 Nov 2009 11:49:21 +0000 (+0000)
Subject: random question history MDL-20951: Two minor bugs in the fix for  MDL-20776.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e14de5aa1cead97c616b2c962eaf83ab470f6814;p=moodle.git

random question history MDL-20951: Two minor bugs in the fix for  MDL-20776.
Thanks to Oleg Sychev for noticing these problems.
---

diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 7157f97c07..1c63909e9c 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -1088,8 +1088,10 @@ class default_questiontype {
         $params = array('aid' => $state->attempt);
         if (isset($question->randomquestionid)) {
             $params['qid'] = $question->randomquestionid;
+            $randomprefix = 'random' . $question->id . '-';
         } else {
             $params['qid'] = $question->id;
+            $randomprefix = '';
         }
         if ($options->history == 'all') {
             $eventtest = 'event > 0';
@@ -1098,7 +1100,7 @@ class default_questiontype {
         }
         $states = $DB->get_records_select('question_states', 
                 'attempt = :aid AND question = :qid AND ' . $eventtest, $params, 'seq_number ASC');
-        if (empty($states)) {
+        if (count($states) <= 1) {
             return '';
         }
 
@@ -1117,6 +1119,9 @@ class default_questiontype {
         }
 
         foreach ($states as $st) {
+            if ($randomprefix && strpos($st->answer, $randomprefix) === 0) {
+                $st->answer = substr($st->answer, strlen($randomprefix));
+            }
             $st->responses[''] = $st->answer;
             $this->restore_session_and_responses($question, $st);