Merge branch 'MDL-53841-master' of http://github.com/damyon/moodle

This commit is contained in:
David Monllao 2016-04-18 14:03:32 +08:00
commit fbc6c48736

View File

@ -205,7 +205,12 @@ class assign {
public function register_return_link($action, $params) {
global $PAGE;
$params['action'] = $action;
$currenturl = new moodle_url('/mod/assign/view.php', array('id' => $this->get_course_module()->id));
$cm = $this->get_course_module();
if ($cm) {
$currenturl = new moodle_url('/mod/assign/view.php', array('id' => $cm->id));
} else {
$currenturl = new moodle_url('/mod/assign/index.php', array('id' => $this->get_course()->id));
}
$currenturl->params($params);
$PAGE->set_url($currenturl);