Permalink
Browse files

Merge branch 'wip-MDL-59311-32' of git://github.com/marinaglancy/mood…

…le into MOODLE_32_STABLE
  • Loading branch information...
dmonllao committed Jul 31, 2017
2 parents f97f4c2 + 2ecdf35 commit bcc09bcf6454b8834785f19fb81e443a11f65dad
Showing with 13 additions and 11 deletions.
  1. +13 −11 course/lib.php
@@ -3329,15 +3329,23 @@ function duplicate_module($course, $cm) {
}
}
$rc->destroy();
if (empty($CFG->keeptempdirectoriesonbackup)) {
fulldelete($backupbasepath);
}
// If we know the cmid of the new course module, let us move it
// right below the original one. otherwise it will stay at the
// end of the section.
if ($newcmid) {
$info = get_fast_modinfo($course);
$newcm = $info->get_cm($newcmid);
$section = $DB->get_record('course_sections', array('id' => $cm->section, 'course' => $cm->course));
moveto_module($newcm, $section, $cm);
moveto_module($cm, $section, $newcm);
$modarray = explode(",", trim($section->sequence));
$cmindex = array_search($cm->id, $modarray);
if ($cmindex !== false && $cmindex < count($modarray) - 1) {
$newcm = get_coursemodule_from_id($cm->modname, $newcmid, $cm->course);
moveto_module($newcm, $section, $modarray[$cmindex + 1]);
}
// Update calendar events with the duplicated module.
$refresheventsfunction = $newcm->modname . '_refresh_events';
@@ -3346,16 +3354,10 @@ function duplicate_module($course, $cm) {
}
// Trigger course module created event. We can trigger the event only if we know the newcmid.
$newcm = get_fast_modinfo($cm->course)->get_cm($newcmid);
$event = \core\event\course_module_created::create_from_cm($newcm);
$event->trigger();
}
rebuild_course_cache($cm->course);
$rc->destroy();
if (empty($CFG->keeptempdirectoriesonbackup)) {
fulldelete($backupbasepath);
}
return isset($newcm) ? $newcm : null;
}

0 comments on commit bcc09bc

Please sign in to comment.