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

This commit is contained in:
Dan Poltawski 2014-05-01 14:52:02 +08:00
commit 066f0395a6

View File

@ -144,7 +144,8 @@ class core_course_courselib_testcase extends advanced_testcase {
// The goal not being to fully test assign_add_instance() we'll stop here for the assign tests - to avoid too many DB queries.
// Advanced grading.
$contextmodule = context_module::instance($dbmodinstance->id);
$cm = get_coursemodule_from_instance('assign', $dbmodinstance->id);
$contextmodule = context_module::instance($cm->id);
$advancedgradingmethod = $DB->get_record('grading_areas',
array('contextid' => $contextmodule->id,
'activemethod' => $moduleinfo->advancedgradingmethod_submissions));