Merge branch 'master' into manticore
This commit is contained in:
commit
02d13ba808
1 changed files with 2 additions and 2 deletions
|
@ -2143,7 +2143,7 @@ class calendar extends rcube_plugin
|
|||
}
|
||||
|
||||
// let this information be cached for 5min
|
||||
send_future_expire_header(300);
|
||||
$this->rc->output->future_expire_header(300);
|
||||
|
||||
echo $status;
|
||||
exit;
|
||||
|
@ -2220,7 +2220,7 @@ class calendar extends rcube_plugin
|
|||
$dte->setTimezone($this->timezone);
|
||||
|
||||
// let this information be cached for 5min
|
||||
send_future_expire_header(300);
|
||||
$this->rc->output->future_expire_header(300);
|
||||
|
||||
echo json_encode(array(
|
||||
'email' => $email,
|
||||
|
|
Loading…
Add table
Reference in a new issue