MDL-15452 - Fix regressions introduced by my recent work on this bug and its children...

diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index 985a7a7f5e83487cf00a79612f47d74864a4520c..4508d5baccd621428ebf704eb1faffdd11cc42e2 100644 (file)
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -75,7 +75,7 @@
 /// Add all questions that are on the submitted form
     if ($submittedquestionids) {
         $submittedquestionids = explode(',', $submittedquestionids);
-        $questionids = $questionids + $submittedquestionids;
+        $questionids = array_unique(array_merge($questionids, $submittedquestionids));
     } else {
         $submittedquestionids = array();
     }
@@ -116,7 +116,8 @@
         unset($responses->forcenewattempt);
 
     /// Extract the responses. $actions will be an array indexed by the questions ids.
-        $actions = question_extract_responses($attemptobj->get_questions(), $responses, $event);
+        $actions = question_extract_responses($attemptobj->get_questions($questionids),
+                $responses, $event);
 
     /// Process each question in turn
         $success = true;