1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 14:32:48 +01:00

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

This commit is contained in:
Adrian Greeve 2019-02-19 11:48:14 +01:00
commit 2fb695f8df

@ -61,9 +61,7 @@ function add_moduleinfo($moduleinfo, $course, $mform = null) {
$newcm->instance = 0; // Not known yet, will be updated later (this is similar to restore code).
$newcm->visible = $moduleinfo->visible;
$newcm->visibleold = $moduleinfo->visible;
if (isset($moduleinfo->visibleoncoursepage)) {
$newcm->visibleoncoursepage = $moduleinfo->visibleoncoursepage;
}
$newcm->visibleoncoursepage = $moduleinfo->visibleoncoursepage;
if (isset($moduleinfo->cmidnumber)) {
$newcm->idnumber = $moduleinfo->cmidnumber;
}
@ -410,6 +408,9 @@ function set_moduleinfo_defaults($moduleinfo) {
if (!isset($moduleinfo->conditionfieldgroup)) {
$moduleinfo->conditionfieldgroup = array();
}
if (!isset($moduleinfo->visibleoncoursepage)) {
$moduleinfo->visibleoncoursepage = 1;
}
return $moduleinfo;
}