MDL-19029 fixed incorrect closing of divs on grader report; merged from MOODLE_19_STABLE

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index 87c0a88fa10fb3bf1363cbfa8c008e637b007da8..40aeb25616b85e027969e040ef2d9b7c43583ebb 100644 (file)
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -166,7 +166,8 @@ $reporthtml .= $report->get_studentshtml();
 $reporthtml .= $report->get_rangehtml();
 $reporthtml .= $report->get_avghtml(true);
 $reporthtml .= $report->get_avghtml();
-$reporthtml .= "</tbody></table></div></div>";
+$reporthtml .= $report->get_endhtml();
+$reporthtml .= '</div>';
 
 // print submit button
 if ($USER->gradeediting[$course->id] and !$report->get_pref('enableajax')) {

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 57e2cac97cab907a340f6f0ea76be45c35695a68..40983bb9846b2f135f67c5033b6e22c0b471179e 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -1074,6 +1074,21 @@ class grade_report_grader extends grade_report {
         return $studentshtml;
     }
 
+    /**
+     * Closes all open elements
+     */
+    public function get_endhtml() {
+        global $CFG, $USER;
+
+        $fixedstudents = empty($USER->screenreader) && $CFG->grade_report_fixedstudents;
+
+        if ($fixedstudents) {
+            return "</tbody></table></div>";
+        } else {
+            return "</tbody></table>";
+        }
+    }
+
     /**
      * Builds and return the HTML row of column totals.
      * @param  bool $grouponly Whether to return only group averages or all averages.