mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-60429 calendar: fix for updating event course and group

Browse Source 
The property courseid and groupid might not be set, so if updating,
use the existing value if a new value wasn't specified.
This commit is contained in:
Jake Dallimore 2017-10-24 16:21:18 +08:00 committed by Andrew Nicols
parent e3a247849b
commit 19fa690c3f
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
calendar/lib.php
View File

@ -599,9 +599,17 @@ class calendar_event {
groupid = ?,
courseid = ?
WHERE repeatid = ?";
$params = array($this->properties->name, $this->properties->description, $timestartoffset,
$this->properties->timeduration, time(), $this->properties->groupid,
$this->properties->courseid, $event->repeatid);
// Note: Group and course id may not be set. If not, keep their current values.
$params = [
$this->properties->name,
$this->properties->description,
$timestartoffset,
$this->properties->timeduration,
time(),
isset($this->properties->groupid) ? $this->properties->groupid : $event->groupid,
isset($this->properties->courseid) ? $this->properties->courseid : $event->courseid,
$event->repeatid
];
} else {
$sql = "UPDATE {event}
SET name = ?,
@ -611,9 +619,16 @@ class calendar_event {
groupid = ?,
courseid = ?
WHERE repeatid = ?";
$params = array($this->properties->name, $this->properties->description,
$this->properties->timeduration, time(), $this->properties->groupid,
$this->properties->courseid, $event->repeatid);
// Note: Group and course id may not be set. If not, keep their current values.
$params = [
$this->properties->name,
$this->properties->description,
$this->properties->timeduration,
time(),
isset($this->properties->groupid) ? $this->properties->groupid : $event->groupid,
isset($this->properties->courseid) ? $this->properties->courseid : $event->courseid,
$event->repeatid
];
}
$DB->execute($sql, $params);