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

This commit is contained in:
Sam Hemelryk 2012-02-20 17:10:52 +13:00
commit 841fcd871b

View File

@ -1124,6 +1124,12 @@ class restore_course_structure_step extends restore_structure_step {
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
$data->restrictmodules = $data->restrictmodules && !empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor == 'all';