From 7bfa4fade3dd43171039d4bc820f2df0dd7f2019 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Wed, 2 Jul 2003 17:30:42 +0000
Subject: [PATCH] Excluded form quiz_choose_random_questions the quiz questions
 to avoid duplicates in quiz. Bug #544. Closed.

---
 mod/quiz/lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index dadd39d3ec..f5e7c65277 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -747,7 +747,7 @@ function quiz_print_quiz_questions($quiz, $results=NULL, $questions=NULL, $shuff
         if ($randomcats = quiz_get_random_categories($quiz->questions)) {
             foreach ($randomcats as $randomcat => $randomdraw) {
                 /// Get the appropriate amount of random questions from this category
-                if (!$catquestions[$randomcat] = quiz_choose_random_questions($randomcat, $randomdraw)) {
+                if (!$catquestions[$randomcat] = quiz_choose_random_questions($randomcat, $randomdraw, $quiz->questions)) {
                     notify(get_string("toomanyrandom", "quiz", $randomcat));
                     return false;
                 }
@@ -908,12 +908,12 @@ function quiz_print_category_form($course, $current) {
 
 
 
-function quiz_choose_random_questions($category, $draws) {
+function quiz_choose_random_questions($category, $draws, $excluded=0) {
 /// Given a question category and a number of draws, this function
 /// creates a random subset of that size - returned as an array of questions
 
     if (!$pool = get_records_select_menu("quiz_questions", 
-                "category = '$category' AND qtype <> ".RANDOM, "", "id,qtype")) {
+                "category = '$category' AND id NOT IN ($excluded) AND qtype <> ".RANDOM, "", "id,qtype")) {
         return false;
     }
 
-- 
2.39.5