L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Jake Dallimore
2017-10-25 12:45:52 +08:00
committed by Andrew Nicols
parent 6ee00de11b 6428642adb
commit bbb9e17133
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/lib.php
+15 -5
View File
@@ -443,7 +443,6 @@ class calendar_event {
);
if (empty($this->properties->id) || $this->properties->id < 1) {
if ($checkcapability) {
if (!calendar_add_event_allowed($this->properties)) {
print_error('nopermissiontoupdatecalendar');
@@ -596,14 +595,25 @@ class calendar_event {
description = ?,
timestart = timestart + ?,
timeduration = ?,
timemodified = ?
timemodified = ?,
groupid = ?,
courseid = ?
WHERE repeatid = ?";
$params = array($this->properties->name, $this->properties->description, $timestartoffset,
$this->properties->timeduration, time(), $event->repeatid);
$this->properties->timeduration, time(), $this->properties->groupid,
$this->properties->courseid, $event->repeatid);
} else {
$sql = "UPDATE {event} SET name = ?, description = ?, timeduration = ?, timemodified = ? WHERE repeatid = ?";
$sql = "UPDATE {event}
SET name = ?,
description = ?,
timeduration = ?,
timemodified = ?,
groupid = ?,
courseid = ?
WHERE repeatid = ?";
$params = array($this->properties->name, $this->properties->description,
$this->properties->timeduration, time(), $event->repeatid);
$this->properties->timeduration, time(), $this->properties->groupid,
$this->properties->courseid, $event->repeatid);
}
$DB->execute($sql, $params);