moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-31532_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

Browse source
This commit is contained in:
Sam Hemelryk 2012-02-20 17:10:39 +13:00
commit cf6fa5025d
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backup/moodle2/restore_stepslib.php
View file

@ -1124,6 +1124,12 @@ class restore_course_structure_step extends restore_structure_step {
unset($data->idnumber); unset($data->idnumber);
} }
// Any empty value for course->hiddensections will lead to 0 (default, show collapsed).
// It has been reported that some old 1.9 courses may have it null leading to DB error. MDL-31532
if (empty($data->hiddensections)) {
$data->hiddensections = 0;
}
// Only restrict modules if original course was and target site too for new courses // Only restrict modules if original course was and target site too for new courses
$data->restrictmodules = $data->restrictmodules && !empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor == 'all'; $data->restrictmodules = $data->restrictmodules && !empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor == 'all';