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

Fix attachment retrieval with direct instance identifiers (#4722)

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-26 15:24:22 +01:00
parent 899646afd8
commit c19bd98233
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -221,7 +221,20 @@ class kolab_calendar extends kolab_storage_folder_api
*/
public function get_attachment_body($id, $event)
{
return $this->ready ? $this->storage->get_attachment($event['id'], $id): false;
if (!$this->ready)
return false;
$data = $this->storage->get_attachment($event['id'], $id);
if ($data == null) {
// try again with master UID
$uid = preg_replace('/-\d+(T\d{6})?$/', '', $event['id']);
if ($uid != $event['id']) {
$data = $this->storage->get_attachment($uid, $id);
}
}
return $data;
}
/**