Fixes for Bug MDL-8617 "Implement groupings & course modules..."

This commit is contained in:
nfreear 2007-02-22 12:59:39 +00:00
parent 5902558c6f
commit 1a9e3005df

View file

@ -124,20 +124,19 @@ function groups_db_get_grouping_settings($groupingid) {
* @return int The id of the grouping or false if there is no such id recorded * @return int The id of the grouping or false if there is no such id recorded
* or if an error occurred. * or if an error occurred.
*/ */
function groups_db_get_grouping_for_coursemodule($coursemoduleid) { function groups_db_get_grouping_for_coursemodule($cm) {
if (!$coursemoduleid) { if (is_object($cm) and isset($cm->course) and isset($cm->groupingid)) {
$groupingid = false; //Do NOT rely on cm->module!
} else { return $cm->groupingid;
$record = get_record('course_modules', 'id', $coursemoduleid, 'id, ' . } elseif (is_numeric($cm)) {
'groupingid'); // Treat param as the course module ID.
if (!$record) { $coursemoduleid = $cm;
$groupingid = false; $record = get_record('course_modules', 'id', $coursemoduleid, 'id, groupingid');
} else { if ($record and isset($record->groupingid)) {
$groupingid = $record->groupingid; return $record->groupingid;
} }
} }
return false;
return $groupingid;
} }