forked from extern/egroupware
* Calendar - Fix merge from list loaded endlessly instead of generating document
This commit is contained in:
parent
87b6bfdbfb
commit
632928887a
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user