Merge branch 'm23_MDL-33942' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

2012-08-07 15:58:25 +08:00
parent 5b74170932 605d6ffcf4
commit e203643539
1 changed files with 3 additions and 1 deletions
@@ -339,7 +339,9 @@ class gradingform_guide_controller extends gradingform_controller {
                $modulename = substr($modulename, 4);
                if ($dbman->table_exists($modulename)) {
                    $cm = get_coursemodule_from_id($modulename, $context->instanceid);
-                    $this->moduleinstance = $DB->get_record($modulename, array("id"=>$cm->instance));
+                    if (!empty($cm)) { // This should only occur when the course is being deleted.
+                        $this->moduleinstance = $DB->get_record($modulename, array("id"=>$cm->instance));
+                    }
                }
            }
        }