Merge branch 'spidev' into 'master'
Kalender See merge request fronk/thetool!749
This commit is contained in:
@@ -478,6 +478,7 @@ class CalendarModel
|
|||||||
$type = ($r->type);
|
$type = ($r->type);
|
||||||
$busy = ($r->busy);
|
$busy = ($r->busy);
|
||||||
$users = ($r->users);
|
$users = ($r->users);
|
||||||
|
$attendees = ($r->attendees);
|
||||||
foreach ($users as $key => $value) {
|
foreach ($users as $key => $value) {
|
||||||
$user_id = $value;
|
$user_id = $value;
|
||||||
}
|
}
|
||||||
@@ -587,6 +588,8 @@ class CalendarModel
|
|||||||
|
|
||||||
$updateArray['attachments'] = $attachments;
|
$updateArray['attachments'] = $attachments;
|
||||||
}
|
}
|
||||||
|
if ($attendees)
|
||||||
|
$updateArray['attendees'] = $attendees;
|
||||||
$json_data = json_encode($updateArray);
|
$json_data = json_encode($updateArray);
|
||||||
$data = [];
|
$data = [];
|
||||||
$data['ms_user_id'] = $microsoft_user_id;
|
$data['ms_user_id'] = $microsoft_user_id;
|
||||||
|
|||||||
Reference in New Issue
Block a user