Merge branch 'MDL-67307' of https://github.com/stronk7/moodle

UniGe · Nov 26, 2019 · d0a4c05 · d0a4c05
2 parents afc430c + 88d88bd
commit d0a4c05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
@@ -3251,6 +3251,9 @@ public function export_for_template(renderer_base $output) {
             if ($letter == $this->current) {
                 $groupletter->selected = $this->current;
             }
+            if (!isset($data->group[$groupnumber])) {
+                $data->group[$groupnumber] = new stdClass();
+            }
             $data->group[$groupnumber]->letter[] = $groupletter;
         }
 

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -2485,6 +2485,8 @@ public function count_submissions_with_status($status, $currentgroup = null) {
      * @return array An array of userids
      */
     protected function get_grading_userid_list($cached = false, $useridlistid = '') {
+        global $SESSION;
+
         if ($cached) {
             if (empty($useridlistid)) {
                 $useridlistid = $this->get_useridlist_key_id();