fix: Fixed a critical issue introduced in 2.4.83 blocking the synchronisation of edits in certain situations

- events being edited didn't set the locked = 1 flag on push

- as reported by SIEMENS
pull/2716/head v2.4.84
iglocska 2017-12-06 17:24:39 +01:00
parent 84adb108dc
commit ced7db17e9
2 changed files with 2 additions and 1 deletions

View File

@ -1 +1 @@
{"major":2, "minor":4, "hotfix":83}
{"major":2, "minor":4, "hotfix":84}

View File

@ -2848,6 +2848,7 @@ class Event extends AppModel {
$params = array_merge($params, array('eventid' => $id, 'includeAttachments' => true, 'includeAllTags' => true, 'deleted' => true));
$event = $this->fetchEvent($elevatedUser, $params);
$event = $event[0];
$event['Event']['locked'] = 1;
$thisUploaded = $this->uploadEventToServer($event, $server, $HttpSocket);
if (!$thisUploaded) {
$uploaded = !$uploaded ? $uploaded : $thisUploaded;