Bug #6276 - Multiple questions not showing up from scale page; merged from MOODLE_16_...

diff --git a/mod/survey/report.php b/mod/survey/report.php
index 69f717d914b415e99b8411df03423c40318acd25..4e1b968f45b8a6d193e99e85fa5411c91d50610f 100644 (file)
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -7,10 +7,14 @@
 
     $id      = required_param('id', PARAM_INT);           // Course Module ID
     $action  = optional_param('action', '', PARAM_ALPHA); // What to look at
-    $qid     = optional_param('qid', 0, PARAM_INT);       // Question ID
+    $qid     = optional_param('qid', 0, PARAM_RAW);       // Question IDs comma-separated list
     $student = optional_param('student', 0, PARAM_INT);   // Student ID
     $notes   = optional_param('notes', '', PARAM_RAW);    // Save teachers notes
 
+    $qids = explode(',', $qid);
+    $qids = clean_param($qids, PARAM_INT);
+    $qid = implode (',', $qids);
+
     if (! $cm = get_coursemodule_from_id('survey', $id)) {
         error("Course Module ID was incorrect");
     }