holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar - Fix selected owner goes missing on logout

Browse Source
This commit is contained in:
nathangray 2017-06-27 10:31:18 -06:00
parent 6c2a6511d8
commit 9a61c16181
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_ui.inc.php
View File

@ -559,7 +559,7 @@ class calendar_ui
if (!is_array($cont)) $cont = array(); if (!is_array($cont)) $cont = array();
$cont['view'] = $this->view ? $this->view : 'week'; $cont['view'] = $this->view ? $this->view : 'week';
$cont['date'] = $this->date ? $this->date : new Api\DateTime(); $cont['date'] = $this->date ? $this->date : new Api\DateTime();
$cont['owner'] = $this->owner ? $this->owner : $cont['owner']; $cont['owner'] = $this->owner ? (is_array($this->owner) ? $this->owner : explode(',',$this->owner) ) : $cont['owner'];
$cont['year'] = (int)Api\DateTime::to($cont['date'],'Y'); $cont['year'] = (int)Api\DateTime::to($cont['date'],'Y');
$cont['holidays'] = $this->bo->read_holidays($cont['year']); $cont['holidays'] = $this->bo->read_holidays($cont['year']);