Conflicts:
backup/util/ui/renderer.php
$html .= html_writer::end_tag('form');
}
- if (!empty($courses) && ($courses->get_count() > 0 || $courses->get_search())) {
+ // If we are restoring an activity, then include the current course.
+ if (!$wholecourse) {
+ $courses->invalidate_results(); // Clean list of courses.
+ $courses->set_include_currentcourse();
+ }
+ if (!empty($courses) && ($courses->get_count() > 0 || $courses->get_search()) && $currentcourse != SITEID) {
// Existing course
$hasrestoreoption = true;
$html .= $form;