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

Merge branch 'master' into manticore

Browse source
This commit is contained in:
Aleksander Machniak 2015-11-10 11:11:53 +01:00
commit 02d13ba808
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar.php
View file

@ -2143,7 +2143,7 @@ class calendar extends rcube_plugin
} }
// let this information be cached for 5min // let this information be cached for 5min
send_future_expire_header(300); $this->rc->output->future_expire_header(300);
echo $status; echo $status;
exit; exit;
@ -2220,7 +2220,7 @@ class calendar extends rcube_plugin
$dte->setTimezone($this->timezone); $dte->setTimezone($this->timezone);
// let this information be cached for 5min // let this information be cached for 5min
send_future_expire_header(300); $this->rc->output->future_expire_header(300);
echo json_encode(array( echo json_encode(array(
'email' => $email, 'email' => $email,