Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle

Conflicts:
	lib/upgrade.txt
    mod/upgrade.txt
This commit is contained in:
Dan Poltawski 2013-10-21 10:57:44 +08:00
commit fb032ccb3f
5 changed files with 56 additions and 9 deletions

View file

@ -742,7 +742,7 @@ class assign {
shift_course_mod_dates('assign',
array('duedate', 'allowsubmissionsfromdate', 'cutoffdate'),
$data->timeshift,
$data->courseid);
$data->courseid, $this->get_instance()->id);
$status[] = array('component'=>$componentstr,
'item'=>get_string('datechanged'),
'error'=>false);