From ac2dd9193a69bf6d2776ef86dba5c9d20200ece9 Mon Sep 17 00:00:00 2001 From: nathangray Date: Fri, 15 Dec 2017 14:27:19 -0700 Subject: [PATCH] * Calendar - Fix merge from list loaded endlessly instead of generating document --- calendar/inc/class.calendar_egw_record.inc.php | 6 +++--- calendar/inc/class.calendar_merge.inc.php | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_egw_record.inc.php b/calendar/inc/class.calendar_egw_record.inc.php index 7bb20af6eb..f550af500c 100644 --- a/calendar/inc/class.calendar_egw_record.inc.php +++ b/calendar/inc/class.calendar_egw_record.inc.php @@ -39,11 +39,11 @@ class calendar_egw_record implements importexport_iface_egw_record */ public function __construct( $_identifier='' ){ $this->identifier = $_identifier; - if(!is_object($this->bo)) { - $this->bo = new calendar_bo(); + if(!is_object(self::$bo)) { + self::$bo = new calendar_bo(); } if($this->identifier) { - $this->record = $this->bo->read($this->identifier); + $this->record = self::$bo->read($this->identifier); } } diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php index 12ce8886d7..2e6bd5884e 100644 --- a/calendar/inc/class.calendar_merge.inc.php +++ b/calendar/inc/class.calendar_merge.inc.php @@ -241,6 +241,12 @@ class calendar_merge extends Api\Storage\Merge { $replacements = array(); if(!is_array($id) || !$id['start']) { + if(strpos($id, ':')) + { + $_id = $id; + $id = array(); + list($id['id'], $id['recur_date']) = explode(':',$_id); + } $event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null); } else { $event = $id;