Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix missing COMMENT in iTip delegation message from the event dialog (#5377)

Browse source
This commit is contained in:
Aleksander Machniak 2016-04-06 07:31:19 -04:00
parent 0c5b7541bc
commit 96dd1b2713
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -1015,6 +1015,7 @@ class calendar extends rcube_plugin
$ev['attendees'] = $event['attendees']; $ev['attendees'] = $event['attendees'];
$ev['free_busy'] = $event['free_busy']; $ev['free_busy'] = $event['free_busy'];
$ev['_savemode'] = $event['_savemode']; $ev['_savemode'] = $event['_savemode'];
$ev['comment'] = $reply_comment;
// send invitation to delegatee + add it as attendee // send invitation to delegatee + add it as attendee
if ($status == 'delegated' && $event['to']) { if ($status == 'delegated' && $event['to']) {
@ -1051,7 +1052,6 @@ class calendar extends rcube_plugin
if (!$noreply) { if (!$noreply) {
$itip = $this->load_itip(); $itip = $this->load_itip();
$itip->set_sender_email($reply_sender); $itip->set_sender_email($reply_sender);
$event['comment'] = $reply_comment;
$event['thisandfuture'] = $event['_savemode'] == 'future'; $event['thisandfuture'] = $event['_savemode'] == 'future';
if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status)) if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
$this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation'); $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');