Merge branch 'MDL-81254-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE

grade/report/singleview/index.php

@@ -226,6 +226,8 @@ if (($itemtype !== 'select') && ($itemtype !== 'grade_select') &&($itemtype !==
     $userreportrenderer = $PAGE->get_renderer('gradereport_singleview');
     // Add previous/next user navigation.
     echo $userreportrenderer->report_navigation($gpr, $courseid, $context, $report, $groupid, $itemtype, $itemid);
+
+    $gui->close();
 }
 
 $event = \gradereport_singleview\event\grade_report_viewed::create(

grade/report/user/index.php

@@ -166,7 +166,6 @@ if (has_capability('moodle/grade:viewall', $context)) {
                 echo $report->print_table(true);
             }
         }
-        $gui->close();
     } else { // Show one user's report.
         // Store the id of the current user item in a session variable which represents the last viewed item.
         $SESSION->gradereport_user["useritem-{$context->id}"] = $userid;
@@ -187,6 +186,8 @@ if (has_capability('moodle/grade:viewall', $context)) {
         // Add previous/next user navigation.
         echo $userreportrenderer->user_navigation($gui, $userid, $courseid);
     }
+
+    $gui->close();
 } else {
     // Students will see just their own report.
     // Create a report instance.

grade/report/user/renderer.php

@@ -149,7 +149,6 @@ class gradereport_user_renderer extends plugin_renderer_base {
         while ($userdata = $gui->next_user()) {
             $users[$userdata->user->id] = $userdata->user;
         }
-        $gui->close();
 
         $arraykeys = array_keys($users);
         $keynumber = array_search($userid, $arraykeys);