Merge branch 'MDL-63975-master' of git://github.com/damyon/moodle

moodle · Feb 4, 2019 · 9ee3b3d · 9ee3b3d
2 parents 2f2b0bf + 1354370
commit 9ee3b3d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
@@ -1113,11 +1113,13 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
                 $cell2 = new html_table_cell(userdate($grade->timemodified));
                 $t->data[] = new html_table_row(array($cell1, $cell2));
 
-                // Graded by.
-                $cell1 = new html_table_cell($gradedbystr);
-                $cell2 = new html_table_cell($this->output->user_picture($grade->grader) .
-                                             $this->output->spacer(array('width'=>30)) . fullname($grade->grader));
-                $t->data[] = new html_table_row(array($cell1, $cell2));
+                // Graded by set to a real user. Not set can be empty or -1.
+                if (!empty($grade->grader) && is_object($grade->grader)) {
+                    $cell1 = new html_table_cell($gradedbystr);
+                    $cell2 = new html_table_cell($this->output->user_picture($grade->grader) .
+                                                 $this->output->spacer(array('width' => 30)) . fullname($grade->grader));
+                    $t->data[] = new html_table_row(array($cell1, $cell2));
+                }
 
                 // Feedback from plugins.
                 foreach ($history->feedbackplugins as $plugin) {