Merge branch 'MDL-46080_26' of https://github.com/jonof/moodle into MOODLE_26_STABLE

2014-07-14 23:30:34 +02:00
parent 522cbb467c 15e7db4e1d
commit e60ca92e1d
1 changed files with 5 additions and 1 deletions
@@ -530,7 +530,11 @@ class assign_grading_table extends table_sql implements renderable {
            return '';
        }
        if ($this->is_downloading()) {
-            return $markers[$row->allocatedmarker];
+            if (isset($markers[$row->allocatedmarker])) {
+                return fullname($markers[$row->allocatedmarker]);
+            } else {
+                return '';
+            }
        }

        if ($this->quickgrading && has_capability('mod/assign:manageallocations', $this->assignment->get_context()) &&