Better code to deal with shuffleorder.

Now feedback is always in the same order as the quiz, and
reports are always in the natural order.

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 0e2a03ad67a91c9a61f997c4e06dc8a37fbea44a..0169bf566cbd84fcc5d028cda1b607926ed8c751 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -716,11 +716,13 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL, $shuff
             notify("Error when reading questions from the database!");
             return false;
         }
+    }
 
-        if (!empty($quiz->shufflequestions)) {    // Mix everything up
+    if (!$shuffleorder) {
+        if (!empty($quiz->shufflequestions)) {              // Mix everything up
             $questions = swapshuffle_assoc($questions);
         } else {
-            $shuffleorder= explode(",", $quiz->questions);  // Use defined order
+            $shuffleorder = explode(",", $quiz->questions);  // Use originally defined order
         }
     }