Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle

2016-11-30 13:56:08 +08:00
parent 99d2667f5c 4a8c6b4259
commit f4aec377fc
1 changed files with 1 additions and 1 deletions
@@ -4793,7 +4793,7 @@ class assign {

        $cangrade = has_capability('mod/assign:grade', $this->get_context());
        // If there is a visible grade, show the summary.
-        if ((!is_null($gradebookgrade->grade) || !$emptyplugins)
+        if (!is_null($gradebookgrade) && (!is_null($gradebookgrade->grade) || !$emptyplugins)
                && ($cangrade || !$gradebookgrade->hidden)) {

            $gradefordisplay = null;