mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
Fixes for Bug MDL-8617 "Implement groupings & course modules..."
This commit is contained in:
parent
5902558c6f
commit
1a9e3005df
1 changed files with 13 additions and 14 deletions
|
@ -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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue