Merge branch 'MDL-28196' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 17:55:31 +0000 (19:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 17:55:31 +0000 (19:55 +0200)
mod/quiz/report/overview/overview_table.php
mod/quiz/report/overview/report.php
mod/quiz/report/statistics/report.php

index 0491ef9..55aacb3 100644 (file)
@@ -75,7 +75,7 @@ class quiz_report_overview_table extends quiz_attempt_report_table {
                         $namekey => get_string('groupavg', 'grades'),
                         'sumgrades' => $this->format_average($record),
                         'feedbacktext'=> strip_tags(quiz_report_feedback_for_grade(
-                                                    $record->grade, $this->quiz->id)));
+                                            $record->grade, $this->quiz->id, $this->context)));
                 if ($this->detailedmarks && ($this->quiz->attempts == 1 || $this->qmsubselect)) {
                     $avggradebyq = $this->load_average_question_grades($this->groupstudents);
                     $groupaveragerow += $this->format_average_grade_for_questions($avggradebyq);
index c36f4a5..de70778 100644 (file)
@@ -509,7 +509,7 @@ class quiz_overview_report extends quiz_attempt_report {
         $usertest = '';
         $params = array();
         if ($groupstudents) {
-            list($usql, $params) = get_in_or_equal($groupstudents);
+            list($usql, $params) = $DB->get_in_or_equal($groupstudents);
             $usertest = "quiza.userid $usql AND ";
         }
 
index 87a89ad..a90e33d 100644 (file)
@@ -1047,7 +1047,7 @@ function quiz_statistics_attempts_sql($quizid, $currentgroup, $groupstudents,
     $qaparams = array('quizid' => $quizid);
 
     if (!empty($currentgroup) && $groupstudents) {
-        list($grpsql, $grpparams) = get_in_or_equal(array_keys($groupstudents),
+        list($grpsql, $grpparams) = $DB->get_in_or_equal(array_keys($groupstudents),
                 SQL_PARAMS_NAMED, 'u');
         $whereqa .= " AND quiza.userid $grpsql";
         $qaparams += $grpparams;