Improvements for shuffleorder in collections of random questions

diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index 2db51c8fc896e53eebc90988b5a0d21c4bff16d1..bfac573766b49f4508e944fcf3e50c9112ad8f29 100644 (file)
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -146,8 +146,7 @@
         print_continue("view.php?id=$cm->id");
 
         if ($quiz->feedback) {
-            $quiz->shufflequestions = false;
-            $quiz->shuffleanswers = false;
+            $quiz->shuffleanswers = false;       // Never shuffle answers in feedback
             quiz_print_quiz_questions($quiz, $result, $questions, $shuffleorder);
             print_continue("view.php?id=$cm->id");
         }

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 26326c3a08528c8f191c5a2fca430c3a99d00934..760e603d94a55073a0e795f878ef5dbe0f871190 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -784,7 +784,6 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL, $shuff
 
     foreach ($questions as $question) {
         $count++;
-        $questionorder[] = $question->id;
 
         $feedback       = NULL;
         $response       = NULL;
@@ -820,6 +819,8 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL, $shuff
             }
         }
 
+        $questionorder[] = $question->id;
+
         print_simple_box_start("CENTER", "90%");
         quiz_print_question($count, $question, $grades[$question->id]->grade, $quiz->course, 
                             $feedback, $response, $actualgrades, $correct,