mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-40701 mod_assignment: fix refresh events

Browse Source 
It was getting the cm event with the wrong id and calling
deprecated functions
This commit is contained in:
Dan Poltawski 2013-07-17 10:29:25 +08:00
parent 07bbbcf174
commit f7d8f38e21
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/assignment/lib.php
View File

@ -3170,7 +3170,8 @@ function assignment_scale_used_anywhere($scaleid) {
* @return boolean Always returns true * @return boolean Always returns true
*/ */
function assignment_refresh_events($courseid = 0) { function assignment_refresh_events($courseid = 0) {
global $DB; global $DB, $CFG;
require_once($CFG->dirroot.'/calendar/lib.php');
if ($courseid == 0) { if ($courseid == 0) {
if (! $assignments = $DB->get_records("assignment")) { if (! $assignments = $DB->get_records("assignment")) {
@ -3184,15 +3185,15 @@ function assignment_refresh_events($courseid = 0) {
$moduleid = $DB->get_field('modules', 'id', array('name'=>'assignment')); $moduleid = $DB->get_field('modules', 'id', array('name'=>'assignment'));
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
$cm = get_coursemodule_from_id('assignment', $assignment->id); $cm = get_coursemodule_from_instance('assignment', $assignment->id, $courseid, false, MUST_EXIST);
$event = new stdClass(); $event = new stdClass();
$event->name = $assignment->name; $event->name = $assignment->name;
$event->description = format_module_intro('assignment', $assignment, $cm->id); $event->description = format_module_intro('assignment', $assignment, $cm->id);
$event->timestart = $assignment->timedue; $event->timestart = $assignment->timedue;
if ($event->id = $DB->get_field('event', 'id', array('modulename'=>'assignment', 'instance'=>$assignment->id))) { if ($event->id = $DB->get_field('event', 'id', array('modulename'=>'assignment', 'instance'=>$assignment->id))) {
update_event($event); $calendarevent = calendar_event::load($event->id);
$calendarevent->update($event);
} else { } else {
$event->courseid = $assignment->course; $event->courseid = $assignment->course;
$event->groupid = 0; $event->groupid = 0;
@ -3202,7 +3203,7 @@ function assignment_refresh_events($courseid = 0) {
$event->eventtype = 'due'; $event->eventtype = 'due';
$event->timeduration = 0; $event->timeduration = 0;
$event->visible = $DB->get_field('course_modules', 'visible', array('module'=>$moduleid, 'instance'=>$assignment->id)); $event->visible = $DB->get_field('course_modules', 'visible', array('module'=>$moduleid, 'instance'=>$assignment->id));
add_event($event); calendar_event::create($event);
} }
} }