Merge branch 'MDL-71838' of https://github.com/timhunt/moodle

moodle · Jun 10, 2021 · d3654c3 · d3654c3
2 parents 4af7195 + 1287eca
commit d3654c3
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/mod/quiz/report/overview/overview_table.php b/mod/quiz/report/overview/overview_table.php
@@ -70,23 +70,25 @@ public function build_table() {
         $this->add_separator();
 
         if (!empty($this->groupstudentsjoins->joins)) {
-            $sql = "SELECT DISTINCT u.id
+            $hasgroupstudents = $DB->record_exists_sql("
+                    SELECT 1
                       FROM {user} u
                     {$this->groupstudentsjoins->joins}
-                     WHERE {$this->groupstudentsjoins->wheres}";
-            $groupstudents = $DB->get_records_sql($sql, $this->groupstudentsjoins->params);
-            if ($groupstudents) {
+                     WHERE {$this->groupstudentsjoins->wheres}
+                    ", $this->groupstudentsjoins->params);
+            if ($hasgroupstudents) {
                 $this->add_average_row(get_string('groupavg', 'grades'), $this->groupstudentsjoins);
             }
         }
 
         if (!empty($this->studentsjoins->joins)) {
-            $sql = "SELECT DISTINCT u.id
+            $hasstudents = $DB->record_exists_sql("
+                    SELECT 1
                       FROM {user} u
                     {$this->studentsjoins->joins}
-                     WHERE {$this->studentsjoins->wheres}";
-            $students = $DB->get_records_sql($sql, $this->studentsjoins->params);
-            if ($students) {
+                     WHERE {$this->studentsjoins->wheres}
+                    " , $this->studentsjoins->params);
+            if ($hasstudents) {
                 $this->add_average_row(get_string('overallaverage', 'grades'), $this->studentsjoins);
             }
         }