MDL-14822 "Quiz Report: the quiz report do not find the first attempt" needed to...

merged from 1.9 branch.

diff --git a/mod/quiz/report/reportlib.php b/mod/quiz/report/reportlib.php
index 0ece6be42809a2eb6d737e79a5fd74433017eee8..2324ea444b270423b5d4a3c01144ac3c03e7c19a 100644 (file)
--- a/mod/quiz/report/reportlib.php
+++ b/mod/quiz/report/reportlib.php
@@ -99,7 +99,9 @@ function quiz_report_qm_filter_subselect($quiz){
         break;
     }
     if ($qmfilterattempts){
-        $qmsubselect = "(SELECT id FROM {$CFG->prefix}quiz_attempts WHERE u.id = userid ORDER BY $qmorderby LIMIT 1)=qa.id";
+        $qmsubselect = "(SELECT id FROM {$CFG->prefix}quiz_attempts " .
+                "WHERE quiz = {$quiz->id} AND u.id = userid " .
+                "ORDER BY $qmorderby LIMIT 1)=qa.id";
     } else {
         $qmsubselect = '';
     }
@@ -134,4 +136,4 @@ function quiz_report_highlighting_grading_method($quiz, $qmsubselect, $qmfilter)
                 ('<span class="highlight">'.quiz_get_grading_option_name($quiz->grademethod).'</span>'))."</p>";
     }
 }
-?>
\ No newline at end of file
+?>